|
@@ -865,11 +865,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
tWarehouseBills.setfItemsStatus(4L);
|
|
tWarehouseBills.setfItemsStatus(4L);
|
|
tWarehouseBills.setfBilltype(billsType);
|
|
tWarehouseBills.setfBilltype(billsType);
|
|
- if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
|
|
- tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
|
- tWarehouseBills.setUpdateTime(new Date());
|
|
|
|
- tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
|
|
- }
|
|
|
|
|
|
+ tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
|
|
+ tWarehouseBills.setUpdateTime(new Date());
|
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
|
|
tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
|
|
boolean businessStatus = "场地直装".equals(tWarehouseBills.getfBusinessType());
|
|
boolean businessStatus = "场地直装".equals(tWarehouseBills.getfBusinessType());
|
|
@@ -977,11 +975,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
Long fPid = null;
|
|
Long fPid = null;
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
- if ("SJCK".equals(billsType)) {
|
|
|
|
- tWarehouseBills.setfItemsStatus(4L);
|
|
|
|
- } else {
|
|
|
|
- tWarehouseBills.setfItemsStatus(6L);
|
|
|
|
- }
|
|
|
|
|
|
+ tWarehouseBills.setfItemsStatus(4L);
|
|
tWarehouseBills.setfBilltype(billsType);
|
|
tWarehouseBills.setfBilltype(billsType);
|
|
if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
|
|
@@ -1208,9 +1202,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
return AjaxResult.error("未找到入账信息");
|
|
return AjaxResult.error("未找到入账信息");
|
|
}
|
|
}
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
- if (status.equals(20L)) {
|
|
|
|
|
|
+ if(status==20){
|
|
tWarehouseBills.setfItemsStatus(2L);
|
|
tWarehouseBills.setfItemsStatus(2L);
|
|
- } else {
|
|
|
|
|
|
+ }else if(status==30){
|
|
tWarehouseBills.setfItemsStatus(3L);
|
|
tWarehouseBills.setfItemsStatus(3L);
|
|
}
|
|
}
|
|
if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
if (StringUtils.isNotNull(tWarehouseBills.getfId())) {
|
|
@@ -1857,7 +1851,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
return AjaxResult.error("未找到入账信息");
|
|
return AjaxResult.error("未找到入账信息");
|
|
}
|
|
}
|
|
TWarehouseBills tWarehousebills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
TWarehouseBills tWarehousebills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
|
|
- tWarehousebills.setfItemsStatus(2L);
|
|
|
|
tWarehousebills.setfItemsStatus(1L); //撤销状态
|
|
tWarehousebills.setfItemsStatus(1L); //撤销状态
|
|
tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
|
|
tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
|
|
tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
|