Merge branch 'refs/heads/fix-warehouse' into test

This reverts commit d2f0ee555b.

YXZG.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="newWizard_KINGDEE_COSMIC_MODULE_TYPE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="cosmic-lib" level="project" />
-  </component>
-</module>

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);

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))

src/main/java/kd/cosmic/Application.java

@@ -3,6 +3,7 @@ package kd.cosmic;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.cosmic.server.Launcher;
+import kd.cosmic.server.Launcher;
 
 /**
  * 启动本地应用程序(微服务节点)
@@ -15,25 +16,23 @@ public class Application {
 //        cosmic.setTenantNumber("sample");
 //        cosmic.setServerIP("10.64.112.152");
 
-        cosmic.setAppName("cosmic-violet-GNfGyyH1");
+        cosmic.setAppName("cosmic-25655-N0OqzfBY");
-        cosmic.setWebPath("E:/Code/ensign_back/ensign-server/webapp");
+        cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
 
-        //152
+        ////152
         cosmic.setClusterNumber("yxzg-topview-dev");
         cosmic.setTenantNumber("yxzg-topview-dev");
         cosmic.setServerIP("10.64.112.152");
-        cosmic.setFileServerPathIPAndPort("","");
+        cosmic.setFileServerPathIPAndPort("", "");
-        cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
+        cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
-
+        System.setProperty("mq.debug.queue.tag", "wrxtest");
-//        134
+        ////134
 //        cosmic.setClusterNumber("yxzg-prod");
 //        cosmic.setTenantNumber("yxzg-prod");
 //        cosmic.setServerIP("10.64.111.134");
 //        cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
 
-
         cosmic.setStartWithQing(false);
         cosmic.start();
     }
-
 }