|
@@ -287,20 +287,15 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("调度数量超出计划箱量不可提交");
|
|
|
}
|
|
|
- ftmsorderbillscntrs.setCntrPlanQty(qty);
|
|
|
- if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- return AjaxResult.error("更新派车数据失败,若多次失败请联系管理员");
|
|
|
- }
|
|
|
// 计划下达数据
|
|
|
- Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
|
|
|
+ /* Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
|
|
|
bills.setPlanUserId(loginUser.getUser().getUserId());
|
|
|
bills.setPlanUserName(loginUser.getUser().getNickName());
|
|
|
bills.setQtyDisPatch(bills.getQtyDisPatch() + tmsorderbillsplans.getCntrQty());
|
|
|
if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("更新派车数据失败,若多次失败请联系管理员");
|
|
|
- }
|
|
|
+ }*/
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
Ftmsorderbillscntrs tmsorderbillscntrs = new Ftmsorderbillscntrs();
|
|
|
tmsorderbillscntrs.setOrgId(tmsorderbillsplans.getOrgId());
|
|
@@ -362,19 +357,19 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("调度数量超出计划箱量不可提交");
|
|
|
}
|
|
|
- tmsorderbillscntrs.setCntrPlanQty(qty);
|
|
|
+ /*tmsorderbillscntrs.setCntrPlanQty(qty);
|
|
|
if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(tmsorderbillscntrs) <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("更新派车数据失败,若多次失败请联系管理员");
|
|
|
- }
|
|
|
+ }*/
|
|
|
// 计划下达数据
|
|
|
- Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
|
|
|
+ /*Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
|
|
|
long cntrQty = ftmsorderbillsplans.getCntrQty() - tmsorderbillsplans.getCntrQty();
|
|
|
bills.setQtyDisPatch(bills.getQtyDisPatch() + cntrQty);
|
|
|
if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("更新派车数据失败,若多次失败请联系管理员");
|
|
|
- }
|
|
|
+ }*/
|
|
|
tmsorderbillsplans.setBillStatus(6L);
|
|
|
tmsorderbillsplans.setCreateTime(new Date());
|
|
|
tmsorderbillsplans.setCreateBy(loginUser.getUsername());
|
|
@@ -428,7 +423,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
|
|
|
return AjaxResult.error("操作失败,该单据未提交");
|
|
|
}
|
|
|
// 查询箱量
|
|
|
- Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(plans.getPId());
|
|
|
+ /*Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(plans.getPId());
|
|
|
long planQty = ftmsorderbillscntrs.getCntrPlanQty() - plans.getCntrQty();
|
|
|
ftmsorderbillscntrs.setCntrPlanQty(planQty);
|
|
|
if (ftmsorderbillscntrsMapper.updateftmsorderbillscntrs(ftmsorderbillscntrs) <= 0) {
|
|
@@ -441,7 +436,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
|
|
|
if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("更新派车数据失败,若多次失败请联系管理员");
|
|
|
- }
|
|
|
+ }*/
|
|
|
String planJson = JSON.toJSONString(ftmsorderbillsplans);
|
|
|
Date time = new Date();
|
|
|
// 调度备份流水号
|