diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index 88c2a19ef..c5bd82cce 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index 37f284886..73e782186 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -175,6 +175,12 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
             total_qty += Double.parseDouble(net_weight);
             row.put("box_no", row.get("package_box_sn"));
 
+            //判断该木箱是否已经存在库内
+            JSONObject str_jo = WQLObject.getWQLObject("st_ivt_structattr").query("storagevehicle_code = '"+row.get("package_box_sn")+"'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(str_jo)){
+                throw new BadRequestException("木箱："+row.get("package_box_sn")+"已存在库内，请对数据进行核实！");
+            }
+
             /*//如果是退货入库，查询对应的包装关系维护交货单号和交货单行号
             if (whereJson.get("bill_type").equals("0002")) {
                 JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '" + row.get("container_name") + "'").uniqueResult(0);