From 4babfcfde8b26c755850e0066f1c07fac38e96a2 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 29 十月 2025 01:22:41 +0800
Subject: [PATCH] 重新优化上报erp出入库完成接口
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
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 87850ea..d25b3a6 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"
@@ -62,7 +62,7 @@
/// <summary>
- /// pda鏌ヨ鍑哄簱鍗曚俊鎭�
+ /// pda鏌ヨ鍏ュ簱鍗曚俊鎭�
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
@@ -740,6 +740,12 @@
}
#endregion
+
+ /// <summary>
+ /// 浜哄伐鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
public WebResponseContent FinishInOrder(int key)
{
WebResponseContent content = new WebResponseContent();
@@ -748,13 +754,26 @@
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;
+ if (item.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
+ {
+ if (item.Details != null)
+ {
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Details = null;
+ }
+ }
+ else
+ {
+ 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";
--
Gitblit v1.9.3