From fb74ccbb0f7d41bdffa9f6c84753c1adf665b927 Mon Sep 17 00:00:00 2001
From: "tanfengling@x-ri.com" <123456>
Date: Mon, 17 Nov 2025 13:57:29 +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=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E5=88=86=E5=BD=95?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E8=B5=84=E8=B4=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lc123/cloud/app/plugin/trd/FWImpl.java | 31 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lc123/cloud/app/plugin/trd/FWImpl.java b/lc123/cloud/app/plugin/trd/FWImpl.java
index e0f129a..e850814 100644
--- a/lc123/cloud/app/plugin/trd/FWImpl.java
+++ b/lc123/cloud/app/plugin/trd/FWImpl.java
@@ -5892,9 +5892,11 @@ public class FWImpl {
         String tqq9_suparea_sh = bill.getString("tqq9_suparea_sh");
         if (tqq9_suparea_sh.contains("B")) {
             gysqyzz_sh = gysqyzz_sh + ",0";
-        }else if (tqq9_suparea_sh.contains("A")) {
+        }
+        if (tqq9_suparea_sh.contains("A")) {
             gysqyzz_sh = gysqyzz_sh + ",1";
-        }else if (tqq9_suparea_sh.contains("C")) {
+        }
+        if (tqq9_suparea_sh.contains("C")) {
             gysqyzz_sh = gysqyzz_sh + ",2";
         }
         if(StringUtils.isNotBlank(gysqyzz_sh)){
@@ -5990,9 +5992,11 @@ public class FWImpl {
         String tqq9_suparea_bj = bill.getString("tqq9_suparea_bj");
         if (tqq9_suparea_bj.contains("B")) {
             gysqyzz_bj = gysqyzz_bj + ",0";
-        }else if (tqq9_suparea_bj.contains("A")) {
+        }
+        if (tqq9_suparea_bj.contains("A")) {
             gysqyzz_bj = gysqyzz_bj + ",1";
-        }else if (tqq9_suparea_bj.contains("C")) {
+        }
+        if (tqq9_suparea_bj.contains("C")) {
             gysqyzz_bj = gysqyzz_bj + ",2";
         }
         if(StringUtils.isNotBlank(gysqyzz_bj)){
@@ -6087,9 +6091,11 @@ public class FWImpl {
         String tqq9_suparea_gz = bill.getString("tqq9_suparea_gz");
         if (tqq9_suparea_gz.contains("B")) {
             gysqyzz_gz = gysqyzz_gz + ",0";
-        }else if (tqq9_suparea_gz.contains("A")) {
+        }
+        if (tqq9_suparea_gz.contains("A")) {
             gysqyzz_gz = gysqyzz_gz + ",1";
-        }else if (tqq9_suparea_gz.contains("C")) {
+        }
+        if (tqq9_suparea_gz.contains("C")) {
             gysqyzz_gz = gysqyzz_gz + ",2";
         }
         if(StringUtils.isNotBlank(gysqyzz_gz)){
@@ -6185,9 +6191,8 @@ public class FWImpl {
         DynamicObjectCollection billentries = bill.getDynamicObjectCollection("billentry");
         for (DynamicObject billentry : billentries) {
             DynamicObject entryrecorg = billentry.getDynamicObject("entryrecorg");
-            String orgNumber = entryrecorg.getString("number");
-            String shzz = FWUtils.getFwOrgNumberByKdOrgNumber(orgNumber);
-            BigDecimal jshj_e = billentry.getBigDecimal("amountandtax");
+            String orgNumber_e = entryrecorg.getString("number");
+            String shzz = FWUtils.getFwOrgNumberByKdOrgNumber(orgNumber_e);
             DynamicObject material = billentry.getDynamicObject("material");
             DynamicObject masterid = material.getDynamicObject("masterid");
             masterid = BusinessDataServiceHelper.loadSingle(masterid.getPkValue(), masterid.getDynamicObjectType().getName());
@@ -6220,7 +6225,7 @@ public class FWImpl {
             String shck = null;
             DynamicObject warehouse = billentry.getDynamicObject("warehouse");
             if (warehouse != null) {
-                shck = warehouse.getString("number")+"_"+orgnumber;
+                shck = warehouse.getString("number")+"_"+orgNumber_e;
             }
             String gys = null;
             DynamicObject supplier = billentry.getDynamicObject("supplier");
@@ -6298,11 +6303,11 @@ public class FWImpl {
             recordObj.put("recordOrder", 0);
             recordObj.put("workflowRequestTableFields", recordsArr);
 
-            if("SHLC".equals(orgNumber)){
+            if("SHLC".equals(orgNumber_e)){
                 recordsArr_sh.add(recordObj);
-            }else if("BJLC".equals(orgNumber)){
+            }else if("BJLC".equals(orgNumber_e)){
                 recordsArr_bj.add(recordObj);
-            }else if("GZLC".equals(orgNumber)){
+            }else if("GZLC".equals(orgNumber_e)){
                 recordsArr_gz.add(recordObj);
             }
         }