From 24e1afea871c5f24d6018f560389359e143031cd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 十月 2025 10:45:16 +0800
Subject: [PATCH] 添加出入库单人工完成功能

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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..9e2c326 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"
@@ -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