From 955fef9ba80fda70582d926a2c6f2af527447bb5 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 22 十一月 2025 08:21:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 2193811..82cd51a 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -74,6 +74,8 @@
     @Autowired
     private LocOwnerService locOwnerService;
     @Autowired
+    private LocSuppService locSuppService;
+    @Autowired
     private ErpSecretServiceImpl erpSecretService;
     @Value("${erp.login.accountId}")
     private String accountId;
@@ -113,7 +115,7 @@
                     jsonObject.put("status", Arrays.asList("B", "C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
                     path = matAddress;
                     break;
-                case "BD_RRGANIZATION": //璐т富鍚屾
+                case "BD_RRGANIZATION": //渚涘簲鍟嗗悓姝�
                     jsonObject.put("start_createtime", "2025-01-01 00:00:00");//id
                     jsonObject.put("end_createtime", sdf1.format(now));
                     jsonObject.put("id", null);
@@ -250,7 +252,7 @@
                         docTypeService.updateById(docType);
                     }
                 }
-                else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//璐т富鍚屾
+                else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//渚涘簲鍟嗗悓姝�
                     int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
                     int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
                     int totalPages = (int) Math.ceil((double) totalCount / pageSize);
@@ -276,42 +278,40 @@
                             String owner = jsonObjectNew.get("name").toString();
                             Date createTime =  sdf1.parse(jsonObjectNew.get("createtime").toString());
                             // 鐢熸垚鍟嗗搧妗f
-                            LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
-                            if (locOwner == null) {
-                                locOwner = new LocOwner();
-                                locOwner.setOwner(owner);
-                                locOwner.setOwnerUuid(ownerUuid);
-                                locOwner.setCreateTime(createTime);
-                                locOwner.setUpdateTime(updateTime);
-                                locOwner.setStatus(1);
-                                if (!locOwnerService.insert(locOwner)) {
-                                    callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓诲嚭閿欙紒" + locOwner, false);
-                                    log.info("鍚屾鏂拌揣涓诲嚭閿欙紒鍙傛暟锛歔{}]銆乕{}]", locOwner, jsonObjectNew);
+                            LocSupp locSupp = locSuppService.selectByUuid(ownerUuid);
+                            if (locSupp == null) {
+                                locSupp = new LocSupp();
+                                locSupp.setOwner(owner);
+                                locSupp.setOwnerUuid(ownerUuid);
+                                locSupp.setCreateTime(createTime);
+                                locSupp.setUpdateTime(updateTime);
+                                locSupp.setStatus(1);
+                                if (!locSuppService.insert(locSupp)) {
+                                    callApiLogSaveSupp(locSupp, kingDeeUtilType, "鍚屾鏂颁緵搴斿晢鍑洪敊锛�" + locSupp, false);
+                                    log.info("鍚屾鏂颁緵搴斿晢鍑洪敊锛佸弬鏁帮細[{}]銆乕{}]", locSupp, jsonObjectNew);
                                 } else {
-                                    callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓绘垚鍔燂紒", true);
-                                    success = true;
+                                    callApiLogSaveSupp(locSupp, kingDeeUtilType, "鍚屾鏂颁緵搴斿晢鎴愬姛锛�", true);
                                 }
                             } else {
                                 boolean isUpdated = false;
-                                if (locOwner.getUpdateTime().compareTo(updateTime) != 0) {
+                                if (locSupp.getUpdateTime().compareTo(updateTime) != 0) {
                                     // 鏇存柊瀛楁
-                                    if (!locOwner.getOwner().equals(owner)) locOwner.setOwner(owner);
-                                    if (!locOwner.getOwnerUuid().equals(ownerUuid)) locOwner.setOwnerUuid(ownerUuid);
+                                    if (!locSupp.getOwner().equals(owner)) locSupp.setOwner(owner);
+                                    if (!locSupp.getOwnerUuid().equals(ownerUuid)) locSupp.setOwnerUuid(ownerUuid);
 
-                                    if (locOwner.getCreateTime().compareTo(createTime) != 0)
-                                        locOwner.setCreateTime(createTime);
-                                    locOwner.setUpdateTime(updateTime);
+                                    if (locSupp.getCreateTime().compareTo(createTime) != 0)
+                                        locSupp.setCreateTime(createTime);
+                                    locSupp.setUpdateTime(updateTime);
                                     isUpdated = true;
                                 }
                                 // 鎵ц鏇存柊鎿嶄綔
                                 if (isUpdated) {
-                                    if (!locOwnerService.updateById(locOwner)) {
-                                        callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鍑洪敊锛�" + locOwner, false);
-                                        log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}], 鏇存柊澶辫触锛�", locOwner.getOwnerUuid());
+                                    if (!locSuppService.updateById(locSupp)) {
+                                        callApiLogSaveSupp(locSupp, kingDeeUtilType, "鏇存柊渚涘簲鍟嗗嚭閿欙紒" + locSupp, false);
+                                        log.info("鏇存柊渚涘簲鍟哰渚涘簲鍟嗙紪鍙凤細{}], 鏇存柊澶辫触锛�", locSupp.getOwnerUuid());
                                     } else {
-                                        callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鎴愬姛锛�", true);
-                                        success = true;
-                                        log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}]", locOwner.getOwnerUuid());
+                                        callApiLogSaveSupp(locSupp, kingDeeUtilType, "鏇存柊渚涘簲鍟嗘垚鍔燂紒", true);
+                                        log.info("鏇存柊渚涘簲鍟哰渚涘簲鍟嗙紪鍙凤細{}]", locSupp.getOwnerUuid());
                                     }
                                 }
                             }
@@ -456,9 +456,9 @@
                 response, bool);
     }
 
-    public void callApiLogSaveOwner(LocOwner locOwner, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
+    public void callApiLogSaveSupp(LocSupp locSupp, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
         apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
-                "璐т富缂栧彿锛�" + locOwner.getOwnerUuid() + "銆佽揣涓诲悕绉帮細" + locOwner.getOwner(),
+                "璐т富缂栧彿锛�" + locSupp.getOwnerUuid() + "銆佽揣涓诲悕绉帮細" + locSupp.getOwner(),
                 response, bool);
     }
 

--
Gitblit v1.9.1