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

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java

@@ -129,4 +129,11 @@ public interface IPdmBiSlittingproductionplanService extends IService<PdmBiSlitt
      * @return /
      */
     List<PdmBiSlittingproductionplan> getByQzzNoByNoStatus(String qzzno);
+
+    /**
+     * 根据子卷号获取一条记录
+     * @param containerName
+     * @return
+     */
+    PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName);
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java

@@ -184,4 +184,11 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
                 .eq(PdmBiSlittingproductionplan::getIs_delete, "0");
         return pdmBiSlittingproductionplanMapper.selectList(lam);
     }
+
+    @Override
+    public PdmBiSlittingproductionplan getByContainerNameNotStatus(String containerName) {
+        LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
+        lam.eq(PdmBiSlittingproductionplan::getContainer_name, containerName);
+        return getOne(lam, false);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java

@@ -1946,7 +1946,7 @@ public class SlitterServiceImpl implements SlitterService {
         // 虚拟计划
         for (int i = 0; i < 4; i++) {
             String containerName = area + "虚拟-" + deviceCode + "-" + i;
-            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+            PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerNameNotStatus(containerName);
             if (ObjectUtil.isEmpty(plan)) {
                 plan = new PdmBiSlittingproductionplan();
                 plan.setWorkorder_id(IdUtil.getSnowflake(1,1).nextIdStr());

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -124,6 +124,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 map.put("box_no", "%" + map.get("box_no") + "%");
 
             }
+            map.put("flag", "11");
         }
 
         if (StrUtil.isNotEmpty(map.get("width"))) {
@@ -146,6 +147,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             } else {
                 map.put("pcsn", "%" + map.get("pcsn") + "%");
             }
+            map.put("flag", "11");
         }
 
         // 空格查询

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -160,39 +160,17 @@
            ) c ON ios.iostorinv_id = c.iostorinv_id
             LEFT JOIN (
                 SELECT
-                    dis.iostorinv_id
+                    SUM(a.plan_qty) AS plan_qty,
+                    a.iostorinv_id
                 FROM
-                    st_ivt_iostorinvdis dis
+                    st_ivt_iostorinvdis a
+                    LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id
                 WHERE
-                    1 = 1
+                    b.io_type = '1'
-                    OPTION 输入.pcsn <> ""
+                    and b.is_delete='0'
-                            dis.pcsn like 输入.pcsn
+                    and b.is_overdue = '0'
-                    ENDOPTION
+                GROUP BY a.iostorinv_id
-                    OPTION 输入.pcsn_in <> ""
+            ) a ON a.iostorinv_id = ios.iostorinv_id
-                            dis.pcsn IN 输入.pcsn_in
-                    ENDOPTION
-                    OPTION 输入.box_no <> ""
-                         dis.box_no like 输入.box_no
-                    ENDOPTION
-                    OPTION 输入.box_no_in <> ""
-                        dis.box_no IN 输入.box_no_in
-                    ENDOPTION
-                GROUP BY
-                    dis.iostorinv_id
-                ) b ON b.iostorinv_id = ios.iostorinv_id
-                LEFT JOIN (
-                    SELECT
-                        SUM(a.plan_qty) AS plan_qty,
-                        a.iostorinv_id
-                    FROM
-                        st_ivt_iostorinvdis a
-                        LEFT JOIN ST_IVT_IOStorInv b ON a.iostorinv_id = b.iostorinv_id
-                    WHERE
-                        b.io_type = '1'
-                        and b.is_delete='0'
-                        and b.is_overdue = '0'
-                    GROUP BY a.iostorinv_id
-                ) a ON a.iostorinv_id = ios.iostorinv_id
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
@@ -268,7 +246,7 @@
                  dtl.iostorinv_id,
                  dtl.vbeln
                ) c ON ios.iostorinv_id = c.iostorinv_id
-                LEFT JOIN (
+                inner JOIN (
                     SELECT
                         dis.iostorinv_id
                     FROM