Mes接口处理

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

@@ -143,11 +143,11 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         log.info("==============接受质检任务下发通知接口开始================={}", data);
         ThreeCoordinateDto threeCoordinateDto = JSONObject.parseObject(data, ThreeCoordinateDto.class);
 
-        MesNotice mesNotice = MesNotice.builder().orderNo(threeCoordinateDto.getOrderNumber()).
+        MesNotice mesNotice = MesNotice.builder().orderNo(threeCoordinateDto.getAuidnr()).
                 buType("TASKDISTRIBUTE").
                 apiType("QUALITYTASK").
-                lineCode("11111").
-                status("0").
+                lineCode("407109").
+                status("1").
                 source("数字化检测系统").
                 targetSource("产线管控单元").
                 acceptPar(data).build();
@@ -226,8 +226,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
 //            JSONObject jsonObject = JSONObject.parseObject(data);
 
             MesNotice mesNotice = MesNotice.builder().orderNo(System.currentTimeMillis()+"").
-                    buType("TASKDISTRIBUTE").lineCode("11111").status("1").source("QUALITY").apiType("TASKDISTRIBUTE")
-                    .targetSource("PRODUCTION_LINE").acceptPar(data).build();
+                    buType("TASKDISTRIBUTE").lineCode("407109").status("1").source("智能总控系统").apiType("MESTASK")
+                    .targetSource("产线管控单元").acceptPar(data).build();
             boolean b = baseService.addNotice(mesNotice);
         } catch (Exception e) {
             e.printStackTrace();
@@ -704,7 +704,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         JSONObject queryWorkSources = new JSONObject();
         JSONObject queryConsumMaterial = new JSONObject();
         JSONObject queryQualityTask = new JSONObject();
-        JSONObject queryCutterTask = new JSONObject();
+        JSONObject queryMesTask = new JSONObject();
 
         for (MesNotice item : mesNoticeList) {
             //String returnData = msgUtil.httpForPost(item.getApiAddress(), jsonParam.toJSONString());
@@ -728,8 +728,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 case "QUALITYTASK":
                     queryQualityTask = (JSONObject) JSONObject.parseObject(returnData);
                     break;
-                case "CUTTERNEED":
-                    queryCutterTask = (JSONObject) JSONObject.parseObject(returnData);
+                case "MESTASK":
+                    queryMesTask = (JSONObject) JSONObject.parseObject(returnData);
                     break;
             }
         }
@@ -741,8 +741,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         JSONObject workOrder = queryWorkOrder.getJSONArray("respBody") != null ? (JSONObject) queryWorkOrder.getJSONArray("respBody").get(0) : null;
         JSONObject workFiles = queryWorkSources.getJSONArray("respBody") != null && queryWorkSources.getJSONArray("respBody").size() > 0 ? (JSONObject) queryWorkSources.getJSONArray("respBody").get(0) : null;
         JSONObject consumMaterial = queryConsumMaterial.getJSONArray("respBody") != null ? (JSONObject) queryConsumMaterial.getJSONArray("respBody").get(0) : null;
-        JSONObject qualityInfo = queryQualityTask.getObject("TaskCode", String.class)!=null ? queryQualityTask : null;
-        JSONObject cutterInfo = queryCutterTask.getObject("AUFNR", String.class)!=null ? queryQualityTask : null;
+        JSONObject qualityInfo = queryQualityTask.getObject("auidnr", String.class)!=null ? queryQualityTask : null;
+        JSONObject mesInfo = queryMesTask.getObject("auidnr", String.class)!=null ? queryMesTask : null;
 
         MMeterial mMeterial = null;
         String processNo  = null;
@@ -753,45 +753,47 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         List<Object> taskList = null;
         List<Object> workPieceList = null;
 
-        if (null != qualityInfo || null!= cutterInfo) {
+        if (null != qualityInfo || null!=mesInfo) {
             //处理质检任务信息
-            if(qualityInfo!=null){
-                processNo = qualityInfo.getString("ProcessCode");
-                workOrderNo = qualityInfo.getString("TaskCode");
-                String batchNo = qualityInfo.getString("BatchNo");
-                String serialNo = qualityInfo.getString("PartOrder");
-                String drawingNo = qualityInfo.getString("DrawNumber");
-
-                //获取默认虚拟原材料
-                mMeterial = materialService.getById(1L);
-                MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
-                materialCode = mMeterial.getMeterialCode();
-                BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
-                if(bom==null){
-                    materialName = mMeterial.getTradeMark();
-                    bom = BBom.builder().synFlag("1").name(materialName+"V"+processNo).batchNo(batchNo).partsNo(mMeterial.getMeterialCode()).partsAlias(mMeterial.getMeterialCode()).no(workOrderNo).brand(processNo).status("1").importantFlag("1").keyFlag("1").zoneId(zone.getId()).drawingNo(drawingNo).build();
-                    bom.setMeterialId(1L);
-                    bBomService.save(bom);
-                }else {
-                    materialName = bom.getName();
-                }
-                version = "V" + processNo;
-
-                //初始化业务订单数据
-                workOrder = new JSONObject();
-                workOrder.put("workOrderNo",  workOrderNo);
-                workOrder.put("materialCode", materialCode);
-                workOrder.put("planSecretLevel", "FM");
-                workOrder.put("processRouteVersion", version);
-                workOrder.put("batchNo",  batchNo);
-                List<Object> orderProductSeqList = Lists.newArrayList();
-                JSONObject data = new JSONObject();
-                data.put("serialNo", serialNo);
-                orderProductSeqList.add(data);
-                workOrder.put("orderProductSeqList",  orderProductSeqList);
-                workPieceList = orderProductSeqList;
+            JSONObject dataInfo = (qualityInfo!=null)? qualityInfo : mesInfo;
+            processNo = dataInfo.getString("afonr");
+            workOrderNo = dataInfo.getString("auidnr");
+            String batchNo = dataInfo.getString("batchno");
+            String serialNo = dataInfo.getString("sno");
+            String drawingNo = dataInfo.getString("graphno");
+            String idnr = dataInfo.getString("idnr");
+
+            materialCode = StringUtil.isNotEmpty(idnr)? idnr: mMeterial.getMeterialCode();
+            //获取默认虚拟原材料
+             mMeterial = materialService.getById(1L);
+             MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
+             materialCode = mMeterial.getMeterialCode();
+            BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
+            if(bom==null){
+                materialName = mMeterial.getTradeMark();
+                bom = BBom.builder().synFlag("1").name(materialName+"V"+processNo).batchNo(batchNo).partsNo(materialCode).partsAlias(materialCode).no(workOrderNo).brand(processNo).status("1").importantFlag("1").keyFlag("1").zoneId(zone.getId()).drawingNo(drawingNo).build();
+                bom.setMeterialId(1L);
+                bBomService.save(bom);
+            }else {
+                materialName = bom.getName();
             }
-            if(null!= cutterInfo){
+            version = "V" + processNo;
+
+            //初始化业务订单数据
+            workOrder = new JSONObject();
+            workOrder.put("workOrderNo",  workOrderNo);
+            workOrder.put("materialCode", materialCode);
+            workOrder.put("planSecretLevel", "FM");
+            workOrder.put("processRouteVersion", version);
+            workOrder.put("batchNo",  batchNo);
+            List<Object> orderProductSeqList = Lists.newArrayList();
+            JSONObject data = new JSONObject();
+            data.put("serialNo", serialNo);
+            orderProductSeqList.add(data);
+            workOrder.put("orderProductSeqList",  orderProductSeqList);
+            workPieceList = orderProductSeqList;
+
+            if(null!=mesInfo){
 
             }
         }else {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/externalApi/dto/ThreeCoordinateDto.java

@@ -60,4 +60,7 @@ public class ThreeCoordinateDto implements Serializable {
     @ApiModelProperty(value = "检测结果集合")
     private List resultList;
 
+    @ApiModelProperty(value = "订单编号")
+    private String auidnr;
+
 }