Mes接口功能处理

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

@@ -320,7 +320,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 //处理推送订单
                 this.distributeHandle(mesNotice.getOrderNo(), mesNotice.getLineCode());
             } else {
-                String returnData = msgUtil.httpForPost(mesNotice.getApiAddress(), jsonParam.toJSONString());
+                String returnData = mesNotice.getAcceptPar();
                 ret = JSONObject.parseObject(returnData);
                 //本地代码处理
                 this.handle(ret, mesNotice.getApiType(), mesNotice.getLineCode());
@@ -417,7 +417,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 order.setOrderNo(workOrder.getString("workOrderNo")).setOrderTime(StringUtil.isNotEmpty(workOrder.getString("plannedStartTime")) ? DateUtil.stringToDate3(workOrder.getString("plannedStartTime")) : new Date()).setDeliveryTime(StringUtil.isNotEmpty(workOrder.getString("plannedEndTime")) ? DateUtil.stringToDate3(workOrder.getString("plannedEndTime")) : new Date()).setSource("2").setProductNum(workPieceList.size())
                         .setStatus("1").setSingleTaskFlag(0).setOrderStatus("1").setBatchNo(workOrder.getString("batchNo"));
                 //产品编码+生产类型编码（P/B P:按序列生产 B:按批次生产）+ 密级编码 + 批次号 + 工艺版本
-                String orderName = "MES_" + workOrder.getString("materialCode") + "_" + workOrder.getString("productPhase").toUpperCase() + "_" + workOrder.getString("planSecretLevel").toUpperCase() + "_" + workOrder.getString("batchNo") + "_" + workOrder.getString("processRouteVersion");
+                String orderName = "MES_" + workOrder.getString("materialCode") + "_" + workOrder.getString("planSecretLevel").toUpperCase() + "_" + workOrder.getString("batchNo") + "_" + workOrder.getString("processRouteVersion");
                 order.setCustId(0L).setOrderName(orderName).setZoneId(zone.getId());
                 orderService.save(order);
 

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

@@ -547,4 +547,15 @@ public class ProductionTasksController {
         String returnData = msgUtil.httpForPost(instructionUrl,jsonParam.toJSONString());
         return R2.success(returnData);
     }
+
+    @ApiOperation(value = "刀具申请上报接口", notes = "刀具申请上报接口")
+    @PostMapping("/cuttingToolApply")
+    public R2 cutingToolApply(@RequestBody Map<String, Object> params) {
+        BaseContextHandler.setTenant("0000");
+        String instructionUrl="http://192.168.11.40:11023/swservers";
+        if(params.isEmpty()) return R2.fail("传参有误");
+        JSONObject jsonParam= (JSONObject) JSONObject.toJSON(params);
+        String returnData = msgUtil.httpForPost(instructionUrl,jsonParam.toJSONString());
+        return R2.success(returnData);
+    }
 }