fix：修改mes任务接受数据

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1765,7 +1765,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             JSONObject dataInfo = new JSONObject();
             //任务加工结束报工
             if(mesNotice.getApiType().equals("MESTASK")){
-                String status = bool? "KS":"JS";
+                String status = bool? "KS":"JS";  // KS 开始报工，结束报工
                 JSONObject acceptPar = JSONObject.parseObject(mesNotice.getAcceptPar());
                 dataInfo.put("finr", "407");
                 dataInfo.put("kpf", "109");

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AAutoNodeLogMapper.xml

@@ -70,8 +70,16 @@
                 LEFT JOIN imcs_o_order ioo ON ioo.id = aanl.order_id
                 LEFT JOIN imcs_t_task_node ittn ON ittn.id = aanl.task_node_id
                 LEFT JOIN imcs_t_workpiece itw ON itw.complete_batch_no = ittn.complete_batch_no
+
+        where 1=1
         <if test="aAutoNodeLog.exeStatus != null and aAutoNodeLog.exeStatus != ''">
-            where aanl.exe_status = ${aAutoNodeLog.exeStatus}
+            and aanl.exe_status = ${aAutoNodeLog.exeStatus}
+        </if>
+        <if test="aAutoNodeLog.uniqueCode != null and aAutoNodeLog.uniqueCode != ''">
+            and itw.unique_code like CONCAT('%', #{aAutoNodeLog.uniqueCode}, '%')
+        </if>
+        <if test="aAutoNodeLog.completeBatchNo != null and aAutoNodeLog.completeBatchNo != ''">
+            and ittn.complete_batch_no like CONCAT('%', #{aAutoNodeLog.completeBatchNo}, '%')
         </if>
         ORDER BY
             aanl.order_id DESC,

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

@@ -987,6 +987,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         String version = null;
         String partsNo = null;
         String batchNo = null;
+        String partName = null; // 零件名称
         String externalTaskCode = null;
         List<Object> taskList = null;
         List<Object> workPieceList = null;
@@ -997,6 +998,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             processNo = (qualityInfo != null) ? dataInfo.getString("ProcessCode") : dataInfo.getString("afonr");
             workOrderNo = (qualityInfo != null) ? dataInfo.getString("OrderNumber") : dataInfo.getString("auidnr");
             batchNo = (qualityInfo != null) ? dataInfo.getString("BatchNo") : dataInfo.getString("batchno");
+            partName = (qualityInfo != null) ? dataInfo.getString("teilebez") : dataInfo.getString("teilebez");
             externalTaskCode = (qualityInfo != null) ? dataInfo.getString("TaskCode") : dataInfo.getString("auidnr");
             String serialNo = (qualityInfo != null) ? dataInfo.getString("PartOrder") : dataInfo.getString("sno");
             String drawingNo = (qualityInfo != null) ? dataInfo.getString("DrawNumber") : dataInfo.getString("graphno");
@@ -1016,9 +1018,9 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             materialCode = StringUtil.isNotEmpty(idnr) ? idnr : mMeterial.getMeterialCode();
             BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, drawingNo + "_" + processNo).eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
             if (bom == null) {
-                materialName = mMeterial.getTradeMark();
-                partsNo = drawingNo + "_" + processNo;
-                bom = BBom.builder().synFlag("1").name(materialName + "V" + processNo).batchNo(batchNo).partsNo(partsNo).partsAlias(materialCode).no(processNo).brand(workOrderNo).status("1").importantFlag("1").keyFlag("1").zoneId(zone.getId()).drawingNo(drawingNo).build();
+                materialName = partName==null?  mMeterial.getTradeMark() : partName;
+                partsNo = drawingNo + "_V" + processNo;
+                bom = BBom.builder().synFlag("1").name(materialName + "V" + processNo).batchNo(batchNo).partsNo(partsNo).partsAlias(materialCode).no(processNo).brand(workOrderNo).status("1").importantFlag("0").keyFlag("0").zoneId(zone.getId()).drawingNo(drawingNo).build();
                 bom.setMeterialId(1L);
                 bom.setBomAlias(partsNo);
                 bBomService.save(bom);
@@ -1226,6 +1228,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 .setStatus("1").setSingleTaskFlag(0).setOrderStatus("1").setBatchNo(workOrder.getString("batchNo")).setExternalTaskCode(workOrder.getString("externalTaskCode"));
         //产品编码+ 密级编码 + 批次号 + 工艺版本
         String orderName = "MES_" + workOrder.getString("materialCode") + "_" + workOrder.getString("planSecretLevel").toUpperCase() + "_" + workOrder.getString("batchNo") + "_" + workOrder.getString("processRouteVersion");
+        orderName = partName==null? orderName : partName +"_"+ processNo;
         order.setCustId(0L).setOrderName(orderName).setZoneId(zone.getId()).setAuditStatus("0");
         orderService.save(order);
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AAutoNodeLog.java

@@ -273,6 +273,9 @@ public class AAutoNodeLog extends Entity<Long> {
     @TableField(exist = false)
     private String completeBatchNo;
 
+    @TableField(exist = false)
+    private String taskType;
+
 
     /**
      * 设备分类