From 92e1560e29419d855c9e23b31c11ef261d391e45 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 27 十月 2025 11:08:47 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
/dev/null | 0
.gitignore | 1
新建文件夹/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs | 6 ++
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 37 ++++++++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs | 17 ++++-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs | 12 ++-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 37 ++++++++++++
新建文件夹/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs | 11 +++
新建文件夹/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs | 8 ++
9 files changed, 118 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index b89bf51..128d367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,3 +258,4 @@
*.bin
*.2
*.2
+/鏂板缓鏂囦欢澶�/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
deleted file mode 100644
index 43176db..0000000
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ /dev/null
Binary files differ
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
index b15195c..ded5aeb 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/ICabinOrderServices.cs"
@@ -19,5 +19,11 @@
WebResponseContent FeedbackIn(SaveModel saveModel);
WebResponseContent CreateInboundOrder(OrderDto.UpstreamOrderInfo order);
WebResponseContent CreateCheckInOrder(OrderDto.UpstreamOrderInfo order);
+ /// <summary>
+ /// 瀹屾垚鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ WebResponseContent FinishInOrder(int key);
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs"
index f039b50..acd20fc 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_ISquareCabinServices/IDeliveryOrderServices.cs"
@@ -50,8 +50,12 @@
/// <param name="saveModel"></param>
/// <returns></returns>
WebResponseContent GetCheckOrders(SaveModel saveModel);
-
-
+ /// <summary>
+ /// 瀹屾垚鍑哄簱鍗�
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ WebResponseContent FinishOutOrder(int key);
/// <summary>
/// 瀹屾垚鐩樼偣浠诲姟
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 259d25b..32b12da 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
{
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index dd4a2a8..d744bac 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -738,5 +738,42 @@
return content;
}
#endregion
+
+ public WebResponseContent FinishInOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in cabinOrders)
+ {
+ if (item.Details != null)
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = cabinOrder.Order_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 3a52494..78352b9 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -970,5 +970,42 @@
}
return content;
}
+
+ public WebResponseContent FinishOutOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in deliveryOrders)
+ {
+ if (item.Details != null)
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = deliveryOrder.Out_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
index 43bade7..016be92 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/CabinOrderController.cs"
@@ -15,7 +15,16 @@
public CabinOrderController(ICabinOrderServices service) : base(service)
{
}
-
+ /// <summary>
+ /// 瀹屾垚鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("FinishInOrder")]
+ public WebResponseContent FinishInOrder(int key)
+ {
+ return Service.FinishInOrder(key);
+ }
/// 鏌ヨ鍗曚俊鎭�
/// </summary>
/// <returns></returns>
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
index 7c65587..da3be19 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/SquareCabin/DeliveryOrderController.cs"
@@ -15,7 +15,16 @@
public DeliveryOrderController(IDeliveryOrderServices service) : base(service)
{
}
-
+ /// <summary>
+ /// 瀹屾垚鍑哄簱鍗�
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("FinishOutOrder")]
+ public WebResponseContent FinishOutOrder(int key)
+ {
+ return Service.FinishOutOrder(key);
+ }
/// <summary>
/// 鍒涘缓鐩樼偣浠诲姟
@@ -23,7 +32,7 @@
/// <param name="keys"></param>
/// <returns></returns>
[HttpPost, HttpGet, Route("CreateCheckOrder")]
- public WebResponseContent CreateCheckOrder([FromBody]int[] keys)
+ public WebResponseContent CreateCheckOrder([FromBody] int[] keys)
{
return Service.CreateCheckOrder(keys);
}
@@ -55,7 +64,7 @@
[HttpPost, HttpGet, Route("GetDeliveryOrderDetail")]
public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
{
- return Service.GetDeliveryOrderDetail(pageNo, orderNo,isPick);
+ return Service.GetDeliveryOrderDetail(pageNo, orderNo, isPick);
}
/// <summary>
/// 瀹屾垚鐩樼偣浠诲姟
@@ -99,6 +108,6 @@
return Service.InventoryGood(batchNo, goodsNo);
}
-
+
}
}
--
Gitblit v1.9.3