From a426450d3f37ace35f69fb85945b5061ed2ae824 Mon Sep 17 00:00:00 2001
From: "tanfengling@x-ri.com" <123456>
Date: Tue, 11 Nov 2025 09:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=9B=E5=BE=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=91=E5=85=B6=E4=BB=96=E5=87=BA=E5=BA=93=E6=A0=B7=E5=93=81?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=8F=92=E4=BB=B6=EF=BC=9B?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=BF=AB=E9=80=92=E5=8D=95=E5=8F=B7=E5=88=B0?=
 =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E6=94=B9=E5=8F=98=E5=8F=96=E5=80=BC=EF=BC=9B?=
 =?UTF-8?q?=20=E3=80=90=E5=B7=A5=E5=85=B7=E7=B1=BB=E3=80=91=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=87=91=E8=9D=B6=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/api/plugin/FWOtheroutApplySavePlugin.java  | 14 +++++++++++++-
 .../plugin/operate/im/OtherOutPushExprnoOp.java    |  4 +++-
 lc123/cloud/app/plugin/utils/FWUtils.java          |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java
index 7894652..5f8480f 100644
--- a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java
+++ b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java
@@ -101,7 +101,10 @@ public class FWOtheroutApplySavePlugin implements ApiSavePlugin {
                     reqDatum.put("tqq9_lshxx", tqq9_lshxx_tag);
                 }
             }
+
+            //处理仓库编码
             String ckNumber = null;
+
             //明细
             List<Map<String, Object>> entries = (List<Map<String, Object>>) reqDatum.get("entryentity");
             for (Map<String, Object> entry : entries) {
@@ -115,8 +118,17 @@ public class FWOtheroutApplySavePlugin implements ApiSavePlugin {
                 entry.put("tqq9_outowner", org);//出库货主
                 entry.put("tqq9_outkeepertype", "bos_org");//出库保管者类型
                 entry.put("tqq9_outkeeper", org);//出库保管者
+                //处理仓库信息，接收泛微仓库编码后，去掉 "<>"和后面的部分
                 Map<String, Object> tqq9_dcck = (Map<String, Object>) entry.get("tqq9_dcck");
-                ckNumber = (String) tqq9_dcck.get("number");
+                if(tqq9_dcck != null){
+                    ckNumber = (String) tqq9_dcck.get("number");
+                    if(StringUtils.isNotBlank(ckNumber) && ckNumber.contains("<>")){
+                        String[] split = ckNumber.split("<>");
+                        ckNumber = split[0];
+                    }
+                }
+                tqq9_dcck.put("number", ckNumber);
+                entry.put("tqq9_dcck", tqq9_dcck);
             }
 
             Map<String, Object> tqq9_ckck_number = new HashMap<>();
diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java b/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java
index 70f4983..2253333 100644
--- a/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java
+++ b/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java
@@ -23,7 +23,9 @@ public class OtherOutPushExprnoOp extends AbstractOperationServicePlugIn {
         super.beforeExecuteOperationTransaction(e);
         DynamicObject[] dataEntities = e.getDataEntities();
         for (DynamicObject dataEntity : dataEntities) {
-            dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), dataEntity.getDynamicObjectType().getName(),"creator,tqq9_entrywl.tqq9_kddh,tqq9_fwrequestid,billno");
+            dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(),
+                    dataEntity.getDynamicObjectType().getName(),
+                    "creator,tqq9_entrywl.tqq9_kddh,tqq9_fwrequestid,billno,tqq9_dept,tqq9_ispushfw");
             String resultStr = FWImpl.returnExprNo(dataEntity);
             if(StringUtils.isNotBlank(resultStr)){
                 JSONObject resultJson = JSONObject.parseObject(resultStr);
diff --git a/lc123/cloud/app/plugin/utils/FWUtils.java b/lc123/cloud/app/plugin/utils/FWUtils.java
index 8c4040e..5f6ba2b 100644
--- a/lc123/cloud/app/plugin/utils/FWUtils.java
+++ b/lc123/cloud/app/plugin/utils/FWUtils.java
@@ -65,7 +65,7 @@ public class FWUtils {
      * @return
      */
     public static DynamicObject getKdUserByFwUserID(String fwUserID){
-        QFilter f = new QFilter("tqq9_fwuserid", "=", fwUserID);
+        QFilter f = new QFilter("entryentity.tqq9_fwuserid", "=", fwUserID);
         DynamicObject[] bos_users = BusinessDataServiceHelper.load("bos_user", "id,name,number", new QFilter[]{f});
         if(bos_users != null && bos_users.length > 0){
             return bos_users[0];