Просмотр исходного кода

变更项目完成时计算拆分编号

anderx лет назад: 3
Родитель
Сommit
d08bd17ae9

+ 14 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -967,10 +967,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 	private void pushTaskAndDun(Integer id,TOrderNew o) {
-		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
-		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
-		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
-		changeAddOrderTask(listct2,map);
+		pushChangeAddOrderTask(id);
+
 		//处理主项目显示派单年份
 		List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
 		for (TChangeDunOut cd : listcd) {
@@ -1005,6 +1003,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	/**
+	 * 通过变更id来处理变更,先将父级新增、再新增子集。为了获取到订单项目的父子级关系
+	 * @param id
+	 */
+	private void pushChangeAddOrderTask(Integer id) {
+		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
+		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
+		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
+		changeAddOrderTask(listct2,map);
+	}
+
+	/**
 	 *
 	 * @param listct 变更数据
 	 * @param input  新增数据Id
@@ -1043,6 +1052,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					Integer i = tOrderTaskMapper.getSplitCount(ot.getSplitSuper());
 					i++;
 					ot.setSplitId(i);
+					ot.setCommodityPrice(new BigDecimal(0));
 				}
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());