Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -2348,13 +2348,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         //是否开盖
         String isUncap = "1";
         if (StringUtils.isNotBlank(vehicle_code)) {
-            if (device_code.equals("RK1018")) {
+            JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + material_barcode + "'").uniqueResult(0);
-                JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(vehicle_info)) {
-                if (ObjectUtil.isEmpty(vehicle_info)) {
+                throw new BadRequestException("未查询到载具号【" + vehicle_code + "】对应的载具信息！");
-                    throw new BadRequestException("未查询到载具号【" + vehicle_code + "】对应的载具信息！");
-                }
-                material_barcode = vehicle_info.getString("pcsn");
             }
+            material_barcode = vehicle_info.getString("pcsn");
         }
         // 查询木箱信息
         BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(

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

@@ -33,6 +33,7 @@ import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.modules.wql.WQL;
@@ -680,7 +681,15 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 json.put("is_paper_ok", "1");
             }
             if (Attribute5.equals("0")) {
-                json.put("is_paper_ok", "5");
+                json.put("is_paper_ok", "2");
+            }
+            if (ResourceName.startsWith("B60FQ000")) {
+                json.put("up_or_down", "1");
+                json.put("left_or_right", "1");
+                json.put("level", "4");
+            }
+            if (ResourceName.equals("B60FQ00007")) {
+                json.put("up_or_down", "2");
             }
             json.put("sale_order_name", Attribute2);
             json.put("start_time", DateUtil.now());
@@ -987,13 +996,30 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                                 plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "B");
                             }
                         } else if (container_name.startsWith("B")) {
+                            /*
+                            //用于子卷拼接的逻辑
                             String up_or_down = plan_jo.getString("up_or_down");
                             if (up_or_down.equals("1")) {
                                 plan_jo.put("qzzno", cut_jo.getString("up_qzzno"));
                             }
                             if (up_or_down.equals("2")) {
                                 plan_jo.put("qzzno", cut_jo.getString("down_qzzno"));
+                            }*/
+                            //调用方法创建一个新的气胀轴编号，赋值
+                            String resourceName = cut_jo.getString("ext_code");
+                            String qzzNO = resourceName.substring(0, 2)
+                                    + resourceName.substring(resourceName.length() - 2)
+                                    + plan_jo.getString("split_group")
+                                    + TaskUtils.getDateTime("MMddHHmm") + "-"
+                                    + plan_jo.getString("up_or_down");
+                            //赋值完成后，将气胀轴编号给绑定到分切机上
+                            if (plan_jo.getString("up_or_down").equals("1")) {
+                                cut_jo.put("up_qzzno", qzzNO);
                             }
+                            if (plan_jo.getString("up_or_down").equals("2")) {
+                                cut_jo.put("down_qzzno", qzzNO);
+                            }
+                            WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo);
                         }
 
                     }

lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java

@@ -45,7 +45,7 @@ public class ComPareUtil {
             throw new BadRequestException("木箱号不能为空!");
         }
         //查询托盘重量
-        JSONObject vehicle_ext = WQLObject.getWQLObject("").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
+        JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(vehicle_ext)) {
             throw new BadRequestException("未查询到托盘的扩展信息");
         }