From 6966c63c04c57ddec44e2e0c00c544a09737097b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 十月 2025 17:17:31 +0800
Subject: [PATCH] 优化PDA入库功能

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
index 02586ea..a0c5c2c 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs"
@@ -152,7 +152,7 @@
                         _unitOfWorkManage.RollbackTran();
                         _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                         SendErrorToUpstream(1, "", ex.Message, "");
-                        return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+                        //return responseContent.Error("鍚屾澶辫触: " + ex.Message);
                     }
                 };
                 return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
@@ -279,7 +279,7 @@
                         _unitOfWorkManage.RollbackTran();
                         _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                         SendErrorToUpstream(3, "", ex.Message, "");
-                        return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+                        //return responseContent.Error("鍚屾澶辫触: " + ex.Message);
                     }
                 }
                 return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
@@ -480,8 +480,8 @@
                         };
 
                         // 4. 璋冪敤鎺ュ彛
-                        //var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
-                        var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
+                        var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+                        //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
 
                         var result = HttpHelper.Post(url, ediDto.ToJsonString());
                         var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
@@ -545,11 +545,13 @@
                     if (!Orders.Where(x => x.OdrderStatus != "宸插畬鎴�").Any())
                     {
                         _unitOfWorkManage.BeginTran();
-                        _cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
                         foreach (var item in Orders)
                         {
-                            _cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+                            if (item.Details != null)
+                                _cabinDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+                            item.Details = null;
                         }
+                        _cabinOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
                         // 璋冪敤涓婃父鎺ュ彛
                         var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
                         var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
@@ -596,11 +598,13 @@
                     if (!Orders.Where(x => x.OutStatus != "宸插畬鎴�").Any())
                     {
                         _unitOfWorkManage.BeginTran();
-                        _deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
                         foreach (var item in Orders)
                         {
-                            _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+                            if (item.Details != null)
+                                _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+                                item.Details = null;
                         }
+                        _deliveryOrderServices.Repository.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
                         var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
                         var requestDate = new
                         {

--
Gitblit v1.9.3