功能修改-sjx

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

@@ -561,6 +561,24 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			// 构建生产订单信息并保存
 			JSONObject yieldJson = jsonItem.getJSONObject("order");
 			YieldOrder yieldOrder = JSON.parseObject(JSON.toJSONString(yieldJson), YieldOrder.class);
+			if(yieldOrder.getYieldType() == 1){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode());
+			}
+			if(yieldOrder.getYieldType() == 2){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_2.getCode());
+			}
+			if(yieldOrder.getYieldType() == 3){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_3.getCode());
+			}
+			if(yieldOrder.getYieldType() == 4){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_4.getCode());
+			}
+			if(yieldOrder.getYieldType() == 5){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_5.getCode());
+			}
+			if(yieldOrder.getYieldType() == 6){
+				yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_6.getCode());
+			}
 			yieldOrder.setYpCode(yieldJson.getString("poCode"));
 			yieldOrder.setYpArea(yieldJson.getDouble("poArea"));
 			yieldOrder.setYpQty(yieldJson.getDouble("poQty"));
@@ -582,6 +600,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 			yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
 			yieldOrder.setPriorityErp(yieldJson.getInteger("priority") + 14000);
 			yieldOrder.setPriorityAps(YieldOrderEnum.PRIORITY_APS_NORMAL.getCode());
+			//零件版本暂时设置为1
+			yieldOrder.setPartVersion("1");
 			// 若任务下达时间为空， 取从erp同步的时间
 			if (ObjectUtil.isEmpty(yieldOrder.getReleaseDate())) {
 				yieldOrder.setReleaseDate(yieldJson.getDate("syncTime"));

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -733,9 +733,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                     //烧结订单和热表订单不同的计算逻辑
                                     if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
                                         if ("0".equals(ability.getType())) {
-                                            totalTime = totalTime + order.getYpQty() * Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                            totalTime = Math.ceil(totalTime + order.getYpQty() * Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue());
                                         } else {
-                                            totalTime = totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                            totalTime = Math.ceil(totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue());
                                         }
                                     }else{
                                         if("玻璃封接组装".equals(processMap.get(craft.getPpsId()))){//玻璃封接组装单独计算

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

@@ -263,7 +263,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
 
 		// 封装 ERP 提交 DTO（原逻辑完全保留）
 		List<ErpStPurOtherDTO> pdList = new ArrayList<>();
-		ErpStPurOtherDTO dto = null;
+		ErpStPurOtherDTO dto = new ErpStPurOtherDTO();
 		for (StBuyOrder bo : list) {
 			dto.setBoId(bo.getId());
 			dto.setBoCode(bo.getBoCode());