From 8dc394ef1aade4457d891eaebd9685684ed499e5 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 8 Jul 2025 16:20:53 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=AE=9A=E6=97=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=8E=9F=E6=9D=90=E6=96=99=E5=87=BA=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=BB=99ERP=E5=BE=AA=E7=8E=AF=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hw/wms/controller/WmsApiController.java   | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
index c7fca51f..d2bd8660 100644
--- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
+++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java
@@ -274,16 +274,32 @@ public class WmsApiController extends BaseController {
     @PostMapping(("/synchronizeRawMaterialDeliveryInformationToERP"))
 //    @Log(title = "同步原材料出库信息", businessType = BusinessType.INSERT)
     public R<AjaxResult> synchronizeRawMaterialDeliveryInformationToERP() {
-        Map<Long, List<WmsRawOutstockDetail>> otherMaterialIdMap = wmsErpScheduledTaskService.synchronizeOtherMaterialDeliveryInformationToERP();
-        for (Long materialId : otherMaterialIdMap.keySet()) {
-            wmsErpScheduledTaskService.syncOutstockInformation(otherMaterialIdMap, materialId, "");
+        int result = 0;
+        StringBuilder errorBuffer = new StringBuilder();
+        //定时同步原材料出库信息给ERP
+        Map<String, List<WmsRawOutstockDetail>> otherMaterialIdMap = wmsErpScheduledTaskService.synchronizeOtherMaterialDeliveryInformationToERP();
+        for (String materialId : otherMaterialIdMap.keySet()) {
+            try {
+                wmsErpScheduledTaskService.syncOutstockInformation(otherMaterialIdMap, materialId, "");
+            } catch (Exception e) {
+                result++;
+                errorBuffer.append(result).append(e.getMessage()).append("|出库ERP异常|");
+            }
         }
 
-        Map<Long, List<WmsRawOutstockDetail>> returnMaterialIdMap = wmsErpScheduledTaskService.synchronizeReturnMaterialDeliveryInformationToERP();
-        for (Long materialId : returnMaterialIdMap.keySet()) {
-            wmsErpScheduledTaskService.syncOutstockInformation(returnMaterialIdMap, materialId, WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_RETURN_OUTSTOCK);
+        //定时同步原材料退货出库信息给ERP
+        Map<String, List<WmsRawOutstockDetail>> returnMaterialIdMap = wmsErpScheduledTaskService.synchronizeReturnMaterialDeliveryInformationToERP();
+        for (String materialId : returnMaterialIdMap.keySet()) {
+            try {
+                wmsErpScheduledTaskService.syncOutstockInformation(returnMaterialIdMap, materialId, WmsConstants.WMS_RAW_OUTSTOCK_TASK_TYPE_RETURN_OUTSTOCK);
+            } catch (Exception e) {
+                result++;
+                errorBuffer.append(result).append(e.getMessage()).append("|退库ERP异常|");
+            }
+        }
+        if (errorBuffer.length() > 0) {
+            return R.fail(errorBuffer.toString());
         }
-
         return R.ok();
     }