排队订单保存接口修改

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -468,7 +468,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			}
 
 			// 先查询原有的订单工艺信息
-			List<YieldOrderCraft> craftOldList = yieldOrderCraftService.list(Wrappers.lambdaQuery(YieldOrderCraft.class).eq(YieldOrderCraft::getYoId, yieldOrder.getId()));
+			List<YieldOrderCraft> craftOldList = yieldOrderCraftService.list(Wrappers.lambdaQuery(YieldOrderCraft.class)
+				.eq(YieldOrderCraft::getYoId, yieldOrder.getId()));
 			// 构建生产订单工艺信息并保存
 			JSONArray craftArray = jsonItem.getJSONArray("craftList");
 			List<YieldOrderCraft> craftList = new ArrayList<>();
@@ -478,6 +479,17 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				craft.setYoId(yieldOrder.getId());
 				craft.setCraftNo(craftJson.getString("craftNo"));
 				craft.setProcessNo(craftJson.getString("processNo"));
+				craft.setPpsId(craftJson.getLong("ppsId"));
+				craft.setStartTime(craftJson.getDate("startTime"));
+				craft.setEndTime(craftJson.getDate("endTime"));
+				craft.setHourQuota(craftJson.getDouble("hourQuota"));
+				craft.setMakeMemo(craftJson.getString("makeMemo"));
+				craft.setPid(craftJson.getLong("pid"));
+				craft.setRpId(craftJson.getLong("rpId"));
+				craft.setMakeTeam(craftJson.getLong("makeTeam"));
+				craft.setWorkCenterId(craftJson.getLong("wcId"));
+				craft.setOcId(craftJson.getLong("ocId"));
+				craft.setCaId(craftJson.getLong("caId"));
 
 				// 若工艺ID或工艺排序为空， 则不保存
 				if (ObjectUtil.isEmpty(craft.getProcessNo()) || ObjectUtil.isEmpty(craft.getPpsId())) {
@@ -485,24 +497,14 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				}
 
 				// 若已经保存过该工序， 则本次不保存
-				if (craftOldList.stream().anyMatch(craftOld -> craftOld.getProcessNo().equals(craft.getProcessNo()) && craftOld.getPpsId().equals(craft.getPpsId()))) {
+				if (craftOldList.stream().anyMatch(craftOld -> craftOld.getProcessNo().equals(craft.getProcessNo())
+					&& craftOld.getPpsId().equals(craft.getPpsId()))) {
 					continue;
 				}
 
-				craft.setStartTime(craftJson.getDate("startTime"));
-				craft.setEndTime(craftJson.getDate("endTime"));
-				craft.setHourQuota(craftJson.getDouble("hourQuota"));
 				if (ObjectUtil.isEmpty(craft.getHourQuota())) {
 					craft.setHourQuota(0D);
 				}
-				craft.setMakeMemo(craftJson.getString("makeMemo"));
-				craft.setPid(craftJson.getLong("pid"));
-				craft.setRpId(craftJson.getLong("rpId"));
-				craft.setPpsId(craftJson.getLong("ppsId"));
-				craft.setMakeTeam(craftJson.getLong("makeTeam"));
-				craft.setWorkCenterId(craftJson.getLong("wcId"));
-				craft.setOcId(craftJson.getLong("ocId"));
-				craft.setCaId(craftJson.getLong("caId"));
 
 				craftList.add(craft);
 			}