diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index cc84d6164..d6d71af4b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -417,7 +417,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
                         jsonDtl.put("width", json.getString("HL02")); // 幅宽
                         tableData.add(jsonDtl);
                     }
-                    if (StrUtil.equals(lfart, "ZLR")) {
+                    if (StrUtil.equals(lfart, "ZLR") || StrUtil.equals(lfart, "ZLR1") || StrUtil.equals(lfart, "ZLR2"))  {
                         /*jsonMst.put("remark",json.getString("LGORT"));//库位*/
                         HashMap map = new HashMap();
                         //更新包装关系
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
index a2c41d654..169258532 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
@@ -211,7 +211,7 @@ public class OutChargeServiceImpl implements OutChargeService {
             //将包装关系中对应的记录状态改为包装
             HashMap<String, String> map = new HashMap<>();
             map.put("status", "1");
-            if (StrUtil.equals(mst_jo.getString("bill_type"), "1001")) {
+            if (StrUtil.equals(mst_jo.getString("bill_type"), "1001") || StrUtil.equals(mst_jo.getString("bill_type"), "1013") || StrUtil.equals(mst_jo.getString("bill_type"), "1014") || StrUtil.equals(mst_jo.getString("bill_type"), "1015")) {
                 WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "' AND status = '3'");
             } else {
                 WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis_row.getString("box_no") + "'");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
index e7224a4cb..967a329a3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_INCHARGE.wql
@@ -71,7 +71,7 @@
             	AND ios.io_type = '0'
             	AND ios.bill_status = '99'
             	AND ios.is_writeoff = '0'
-            	AND ios.bill_type = '0002'
+            	AND ios.bill_type in ('0002','0013','0014')
                 and ios.stor_id in 输入.in_stor_id
             OPTION 输入.bill_code <> ""
                    ios.bill_code like 输入.bill_code
@@ -125,7 +125,7 @@
                 AND ios.io_type = '0'
                 AND ios.bill_status = '99'
                 AND ios.is_writeoff = '0'
-                AND ios.bill_type = '0002'
+                AND ios.bill_type in ('0002','0013','0014')
                 and ios.stor_id in 输入.in_stor_id
             OPTION 输入.bill_code <> ""
                    ios.bill_code like 输入.bill_code
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 30df8d0a7..4c764b4cf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -977,7 +977,7 @@
                       AND
                           ios.bill_status = '99'
                       AND
-                          ios.bill_type in ('1001','1009')
+                          ios.bill_type in ('1001','1009','1013','1014','1015')
                       AND
                         ios.stor_id in 输入.in_stor_id
                           OPTION 输入.bill_code <> ""
diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue
index 7b3de2254..41ec64c61 100644
--- a/lms/nladmin-ui/src/views/login.vue
+++ b/lms/nladmin-ui/src/views/login.vue
@@ -58,7 +58,7 @@ export default {
       codeUrl: '',
       cookiePass: '',
       loginForm: {
-        username: 'admin',
+        username: '',
         password: '',
         rememberMe: false,
         code: '',
diff --git a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue
index e1e969a55..fc8b26996 100644
--- a/lms/nladmin-ui/src/views/wms/st/incharge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/incharge/index.vue
@@ -80,7 +80,7 @@
               <el-option
                 v-for="item in dict.ST_INV_IN_TYPE"
                 :key="item.value"
-                :disabled="item.value !== '0002'"
+                :disabled="item.value !== '0002' && item.value !== '0013' && item.value !== '0014'"
                 :label="item.label"
                 :value="item.value"
               />
diff --git a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
index 3e4470938..141b13415 100644
--- a/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
@@ -79,7 +79,11 @@
               <el-option
                 v-for="item in dict.ST_INV_OUT_TYPE"
                 :key="item.value"
-                :disabled="item.value !== '1001' && item.value !== '1009'"
+                :disabled="item.value !== '1001'
+                && item.value !== '1009'
+                && item.value !== '1013'
+                && item.value !== '1014'
+                && item.value !== '1015'"
                 :label="item.label"
                 :value="item.value"
               />