diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/botp/tracktaskconsoleToorderproreqbillPugIn.java b/src/main/java/com/yem/wm/im/orderproreqbill/botp/tracktaskconsoleToorderproreqbillPugIn.java
index 3c98f871..07b4ad47 100644
--- a/src/main/java/com/yem/wm/im/orderproreqbill/botp/tracktaskconsoleToorderproreqbillPugIn.java
+++ b/src/main/java/com/yem/wm/im/orderproreqbill/botp/tracktaskconsoleToorderproreqbillPugIn.java
@@ -147,9 +147,9 @@ public class tracktaskconsoleToorderproreqbillPugIn extends AbstractConvertPlugI
                     //仓库
 //                    materialinfo.set("yem_warehouse", whObj);
                     //库区
-                    materialinfo.set("yem_warearea", yem_warearea);
+//                    materialinfo.set("yem_warearea", yem_warearea);
                     //库位
-                    materialinfo.set("yem_whlocation", yem_whlocation);
+//                    materialinfo.set("yem_whlocation", yem_whlocation);
                     //仓管员
 //                    DynamicObject user = BusinessDataServiceHelper.loadSingle("bos_user", new QFilter[]{new QFilter("number", QCP.equals, list.get(0).get("stocker_code"))});
 //                    materialinfo.set("yem_whman", user);
@@ -162,9 +162,9 @@ public class tracktaskconsoleToorderproreqbillPugIn extends AbstractConvertPlugI
                     //仓库
 //                    materialinfo.set("yem_warehouse", whObj);
                     //库区
-                    materialinfo.set("yem_outareacode", warearea);
+//                    materialinfo.set("yem_outareacode", warearea);
                     //库位
-                    materialinfo.set("yem_outpositioncode", whlocationObj);
+//                    materialinfo.set("yem_outpositioncode", whlocationObj);
                     //仓管员
 //                    DynamicObject user = BusinessDataServiceHelper.loadSingle("bos_user", new QFilter[]{new QFilter("number", QCP.equals, list.get(0).get("stocker_code"))});
 //                    materialinfo.set("yem_outstockercode", user);
diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/from/OrderproreqbillEdit.java b/src/main/java/com/yem/wm/im/orderproreqbill/from/OrderproreqbillEdit.java
index 73f6b34b..ee5d5837 100644
--- a/src/main/java/com/yem/wm/im/orderproreqbill/from/OrderproreqbillEdit.java
+++ b/src/main/java/com/yem/wm/im/orderproreqbill/from/OrderproreqbillEdit.java
@@ -430,7 +430,9 @@ public class OrderproreqbillEdit extends AbstractBillPlugIn implements BeforeF7S
 //                    e.addCustomQFilter(new QFilter("group.yem_sort", QCP.equals, yemIsvmi));
                 //根据仓库过滤库区
                 DynamicObject wh = (DynamicObject) getModel().getValue("yem_warehouse", row);
-                e.addCustomQFilter(new QFilter("group.id", QCP.equals, wh.get("id")));
+                if (YEM.isNotEmpty(wh)) {
+                    e.addCustomQFilter(new QFilter("group.id", QCP.equals, wh.get("id")));
+                }
                 break;
             case "yem_outareacode":
 //                if ("V".equals(yemIsvmi) || "C".equals(yemIsvmi) || StringUtils.isBlank(yemIsvmi))
@@ -438,7 +440,9 @@ public class OrderproreqbillEdit extends AbstractBillPlugIn implements BeforeF7S
 //                if(!StringUtils.isBlank(yemIsvmi))e.addCustomQFilter(new QFilter("group.yem_sort",QCP.equals,yemIsvmi));
                 //根据仓库过滤库区
                 DynamicObject wh1 = (DynamicObject) getModel().getValue("yem_outwhcode", row);
-                e.addCustomQFilter(new QFilter("group.id", QCP.equals, wh1.get("id")));
+                if (YEM.isNotEmpty(wh1)) {
+                    e.addCustomQFilter(new QFilter("group.id", QCP.equals, wh1.get("id")));
+                }
                 break;
             case "yem_whlocation":
 //                if ("V".equals(yemIsvmi) || "C".equals(yemIsvmi) || StringUtils.isBlank(yemIsvmi))