|
|
@@ -1048,15 +1048,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
|
|
|
ot.setSplitSuper(tid);
|
|
|
}
|
|
|
- //计算出拆分编号
|
|
|
- Integer i = tOrderTaskMapper.getSplitCount(ot.getSplitSuper());
|
|
|
- i++;
|
|
|
- ot.setSplitId(i);
|
|
|
+ ot.setSplitId(pushSplitId(ot.getSplitSuper()));
|
|
|
ot.setCommodityPrice(new BigDecimal(0));
|
|
|
}
|
|
|
if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
|
|
|
if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
|
|
|
-
|
|
|
tOrderTaskMapper.insertSelective(ot);
|
|
|
InputAddTask inMid=new InputAddTask();
|
|
|
inMid.setId(ot.getId());
|
|
|
@@ -1081,6 +1077,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
ot.setId(cd.getTid());
|
|
|
ot.setCommodityPrice(cd.getCommodityPrice());
|
|
|
ot.setCommodityQuantity(cd.getCommodityQuantity());
|
|
|
+ if (ot.getSplitSuper()!=null)ot.setSplitId(pushSplitId(ot.getSplitSuper()));
|
|
|
if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
|
|
|
if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
|
|
|
tOrderTaskMapper.updateByPrimaryKeySelective(ot);
|
|
|
@@ -1098,6 +1095,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
+ private Integer pushSplitId(Integer splitSuper) {
|
|
|
+ //计算出拆分编号
|
|
|
+ Integer i = tOrderTaskMapper.getSplitCount(splitSuper);
|
|
|
+ i++;
|
|
|
+ return i;
|
|
|
+ }
|
|
|
+
|
|
|
private void updateTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
|
|
|
TTaskMid tTaskMid = new TTaskMid();
|
|
|
tTaskMid.setTid(id);
|