配套查询修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java

@@ -68,4 +68,16 @@ public class SjCompleteVO {
     @JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
     private Date putStoreTime;
 
+    @Schema(description = "镀种")
+    private String plate;
+
+    @Schema(description = "材料")
+    private String material;
+
+    @Schema(description = "子件类型")
+    private Integer yieldType;
+
+    @Schema(description = "子件类型")
+    private String yieldTypeName;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml

@@ -190,13 +190,17 @@
         a.CARD_NO AS cardNo,
         a.PRODUCT_IDENT AS productIdent,
         a.YP_QTY AS ypQty,
-        a.YP_AREA AS ypArea,
+        ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea,
         a.PRIORITY_ERP AS priorityErp,
         a.RELEASE_DATE AS releaseDate,
-        b.PUT_STORE_TIME AS putStoreTime
+        b.PUT_STORE_TIME AS putStoreTime,
+        a.PLATE AS plate,
+        a.YIELD_TYPE AS yieldType,
+        c.material AS material
         FROM
         MES_YIELD_ORDER a
         INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id
+        INNER JOIN DS_PART c ON a.part_code = c.part_code
         WHERE
         a.IS_DELETED = 0
         AND b.IS_DELETED = 0
@@ -228,13 +232,17 @@
         a.CARD_NO AS cardNo,
         a.PRODUCT_IDENT AS productIdent,
         a.YP_QTY AS ypQty,
-        a.YP_AREA AS ypArea,
+        ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea,
         a.PRIORITY_ERP AS priorityErp,
         a.RELEASE_DATE AS releaseDate,
-        b.PUT_STORE_TIME AS putStoreTime
+        b.PUT_STORE_TIME AS putStoreTime,
+        a.PLATE AS plate,
+        a.YIELD_TYPE AS yieldType,
+        c.material AS material
         FROM
         MES_YIELD_ORDER a
         INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id
+        INNER JOIN DS_PART c ON a.part_code = c.part_code
         WHERE
         a.IS_DELETED = 0
         AND b.IS_DELETED = 0

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java

@@ -612,13 +612,13 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 // 修改车间订单数量
                 WorkOrder workOrder = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getCardNo, yieldOrder.getCardNo())).get(0);
                 if (workOrder != null) {
-//                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
+                WorkOrderRun workOrderRun = workOrderRunService.getById(workOrder.getWorId());
-//                try {
+                try {
                     // erp接口调用更新数量
-//                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), mesDataMaintainLog.getMemo(), mesDataMaintainLog.getQtyAfter(), AuthUtil.getUserName()).getData();
+                    erpDataProduceClient.erpUpdateMakeQty(workOrderRun.getWoCode(), dataMaintainLog.getMemo(), Double.valueOf(dataMaintainLog.getAfterValue()), AuthUtil.getUserName());
-//                } catch (Exception e) {
+                } catch (Exception e) {
-//                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
+                    throw new ServiceException("erp接口调用修改订单加工数量失败：" + e.getMessage());
-//                }
+                }
                     double numAfter = Double.parseDouble(dataMaintainLog.getAfterValue());
                     double num = numAfter - yieldOrder.getYpQty();
                     yieldOrder.setYpQty(numAfter);

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -787,12 +787,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
         }
         workOrder.setOcId(ocId);
         workOrderMapper.updateById(workOrder);
-        workPlans.forEach(workPlan -> {
+        workPlans.forEach(workPlan -> workPlan.setOcId(ocId));
-            workPlan.setOcId(ocId);
-        });
         List<BatchResult> batchResults = workPlanMapper.updateById(workPlans);
-        // todo:qyl 2.在MES更改后同步给ERP
-
         return null;
     }
 

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

@@ -2998,7 +2998,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 }
             }
         }
-        subCompleteData.forEach(sjCompleteVO -> sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp())));
+        subCompleteData.forEach(sjCompleteVO -> {
+            sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp()));
+            sjCompleteVO.setYieldTypeName(YieldOrderEnum.getName(sjCompleteVO.getYieldType()));
+        });
         return subCompleteData;
     }