MES报工接口数据处理

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/ProductionTasksController.java

@@ -375,45 +375,44 @@ public class ProductionTasksController {
         TWorkpiece tWorkpiece = workpieceService.getOne(new LambdaQueryWrapper<TWorkpiece>().eq(TWorkpiece::getOrderNo, workOrderNo).eq(TWorkpiece::getIsEnd, "1").orderByDesc(TWorkpiece::getUpdateTime).last("limit 1"));
         TTask firstTask = taskService.getOne(new LambdaQueryWrapper<TTask>().eq(TTask::getOrderNo, workOrderNo).eq(TTask::getCompleteBatchNo, tWorkpiece.getCompleteBatchNo()).eq(TTask::getFirstProcedureFlag, "1"));
         TTask tTask = taskService.getOne(new LbqWrapper<TTask>().eq(TTask::getOrderNo, workOrderNo).eq(TTask::getCompleteBatchNo, tWorkpiece.getCompleteBatchNo()).eq(TTask::getLastProcedureFlag, "1"));
+        OrderQuality orderQuality = orderQualityService.getOne(new LambdaQueryWrapper<OrderQuality>().eq(OrderQuality::getOrderNo, workOrderNo).eq(OrderQuality::getWorkpieceId, tTask.getCompleteBatchNo()));
 
         List<Map<String, Object>> processReportList = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> workOrderReportItems = new ArrayList<Map<String, Object>>();
-        JSONObject report = new JSONObject();
-        report.put("repConclusionCode", "1");
-        report.put("batchNo", batchNo);
-        report.put("quantity", "1");
-        report.put("serialNo", tWorkpiece.getSerialNo());
-        workOrderReportItems.add(report);
 
         JSONObject processReport = new JSONObject();
-        processReport.put("workOrderNo", workOrderNo);
-        processReport.put("processNo", processNo);
-        processReport.put("realityStartTime", firstTask.getStartTime()!=null?DateUtil.formatTime(firstTask.getStartTime()): DateUtil.formatTime(new Date()));
-        processReport.put("realityEndTime", tTask.getEndTime()!=null? DateUtil.formatTime(tTask.getEndTime()): DateUtil.formatTime(new Date()));
-        processReport.put("workOrderReportItems", workOrderReportItems);
-
-
-        OrderQuality orderQuality = orderQualityService.getOne(new LambdaQueryWrapper<OrderQuality>().eq(OrderQuality::getOrderNo, workOrderNo).eq(OrderQuality::getWorkpieceId, tTask.getCompleteBatchNo()));
-        List<Map<String, Object>> itemList = new ArrayList<Map<String, Object>>();
-        //替换属性
         JSONObject inspection = new JSONObject();
+        JSONObject report = new JSONObject();
+        List<Map<String, Object>> itemList = new ArrayList<Map<String, Object>>();
         if(orderQuality!=null) {
             Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, workOrderNo).last("limit 1"));
             inspection.put("batchNo", batchNo);
             inspection.put("inspectValue", "1");
             inspection.put("serialNo", tWorkpiece.getSerialNo());
             inspection.put("checkItem", order.getOrderName());
-            inspection.put("checkRequire", "合格");
+            inspection.put("checkRequire", orderQuality.getOkFlag().equals("OK")?"合格":"不合格");
             inspection.put("upperLimit", "1");
             inspection.put("upperLower", "2");
             inspection.put("selfInspecConclusion", "1");
             itemList.add(inspection);
+            report.put("repConclusionCode", orderQuality.getOkFlag().equals("OK")?"1":"0");
+        }else{
+            report.put("repConclusionCode", "1");
         }
         processReport.put("selfinspectionItems", itemList);
+
+        report.put("batchNo", batchNo);
+        report.put("quantity", "1");
+        report.put("serialNo", tWorkpiece.getSerialNo());
+        workOrderReportItems.add(report);
+
+        processReport.put("workOrderNo", workOrderNo);
+        processReport.put("processNo", processNo);
+        processReport.put("realityStartTime", firstTask.getStartTime()!=null?DateUtil.formatTime(firstTask.getStartTime()): DateUtil.formatTime(new Date()));
+        processReport.put("realityEndTime", tTask.getEndTime()!=null? DateUtil.formatTime(tTask.getEndTime()): DateUtil.formatTime(new Date()));
+        processReport.put("workOrderReportItems", workOrderReportItems);
+
         processReportList.add(processReport);
-        //JSONObject jsonParam= new JSONObject();
-        //jsonParam.put("processReportList", processReportList);
-        //String returnData = msgUtil.httpForPost(instructionUrl,jsonParam.toJSONString());
         return processReportList;
     }
 
@@ -466,7 +465,18 @@ public class ProductionTasksController {
         jsonParam.put("processReportList", processReportList);
 
         //工单产品序列报工明细信息数据字典
-        jsonParam.put("proRepList", new ArrayList<Map<String, Object>>());
+        List<Map<String, Object>> proRepList = new ArrayList<Map<String, Object>>();
+        JSONObject proRepItem = new JSONObject();
+        proRepItem.put("workOrderNo", workOrderNo);
+        proRepItem.put("serialNo", tWorkpiece.getSerialNo());
+        OrderQuality orderQuality = orderQualityService.getOne(new LambdaQueryWrapper<OrderQuality>().eq(OrderQuality::getOrderNo, workOrderNo).eq(OrderQuality::getWorkpieceId, tWorkpiece.getCompleteBatchNo()));
+        if(orderQuality!=null) {
+            proRepItem.put("repConclusionCode", "1");
+        }else{
+            proRepItem.put("repConclusionCode", orderQuality.getOkFlag().equals("OK")?"1":"0");
+        }
+        proRepList.add(proRepItem);
+        jsonParam.put("proRepList", proRepList);
 
         String returnData = msgUtil.httpForPost(instructionUrl,jsonParam.toJSONString());
         return R2.success(returnData);