新增提示

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -224,7 +224,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 JSONObject json = new JSONObject();
                 json.put("device_code", jsonSb.getString("point_code"));
                 json.put("task_code", task_jo.getString("task_code"));
-                json.put("option ", "2");
+                json.put("option", "2");
                 paramArr.add(json);
 
                 JSONObject resultAcs = new WmsToAcsServiceImpl().updateTask(paramArr);
@@ -295,6 +295,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     if (ObjectUtil.isEmpty(bakingTemperature)) throw new BadRequestException("温度不能为空");
                     if (ObjectUtil.isEmpty(bakingTimer)) throw new BadRequestException("烘烤时间不能为空");
 
+                    //更新生箔工单的是否下发烘烤为是
+                    HashMap<String,String> map = new HashMap<>();
+                    map.put("is_baking","1");
+                    WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+ContainerName+"'");
+                    log.info("母卷："+ContainerName+"被决策入烘箱，请求烘烤标识改为1");
+
                     String point_code = "";
                     JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0);
                     if (ObjectUtil.isEmpty(jsonCoolIvt)) {
@@ -303,13 +309,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     } else {
                         point_code = jsonCoolIvt.getString("full_point_code");
                     }
-                    if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("该母卷现在不存在暂存位或对接点位上，不能进行入烘箱操作！");
+                    if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("该母卷现在还未绑定在暂存位或对接点位上，不能进行入烘箱操作！！请检查当前母卷所在位置，并绑定对应位置");
-
-                    //更新生箔工单的是否下发烘烤为是
-                    HashMap<String,String> map = new HashMap<>();
-                    map.put("is_baking","1");
-                    WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(map,"container_name = '"+ContainerName+"'");
-                    log.info("母卷："+ContainerName+"被决策入烘箱，请求烘烤标识改为1");
 
                     // 调用接口输入参数
                     jsonParam.put("option", "1");
@@ -466,7 +466,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             json.put("is_child_tz_ok", "0");
             json.put("is_child_ps_ok", "0");
             json.put("is_delete", "0");
-            tab.insert(json);
+            tab.insert(json); 
 
             result.put("RTYPE", "S");
             result.put("RTMSG", "操作成功!");
@@ -750,6 +750,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     if (ObjectUtil.isEmpty(plan_jo)) {
                         throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup"));
                     }
+
+                    //查询当前子卷号状态
+                    String now_status = plan_jo.getString("status");
+                    if (!now_status.equals("05")){
+                        log.info("子卷号："+row.getString("ContainerGroup")+"当前状态为："+now_status+"，被MES的开始分切接口改为入站完成！");
+                    }
                     //如果入站的分切计划气涨轴为空，则虚拟一个气a涨轴编号
                     if (StrUtil.isEmpty(plan_jo.getString("qzzno"))) {
                         if (i == 0 || i == 2) {
@@ -790,6 +796,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                     if ("0".equals(need_down)) {
                         plan_jo.put("status", "09");
                         WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo);
+                        log.info("子卷号："+row.getString("ContainerGroup")+"MES上选择了不需要下卷，不生成任务！");
                     } else {
                         if (row.getString("ContainerPosition").equals("1")) {
                             if (StrUtil.isEmpty(up_qzz)) {