From 5a15fa73d5f6a39917013871a65eb11a8c013391 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 05 十一月 2025 17:30:56 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 5893c7e..5c09857 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -119,7 +119,7 @@
orderdetailshtys.Add(item.Adapt<Dt_OrderOutDetails_Hty>());
});
- var allocateOrderdetail = orderDetails.Where(x => x.OrderType == (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�).ToList();
+ var allocateOrderdetail = orderDetails.Where(x => true).ToList();
await ERPAllocateOut(stock);
@@ -153,14 +153,18 @@
{
continue;
}
- var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode);
+ var boxingdetail = boxingInfo.BoxingInfoDetails.Where(x => x.MaterielCode == item.MaterielCode).ToList();
if (boxingdetail.Count() > 0)
{
foreach (var detail in boxingdetail)
{
- detail.Quantity = detail.Quantity - item.OutboundQuantity;
+ //detail.Quantity = detail.Quantity - item.OutboundQuantity;
detail.Warehouse = "WMS鍑哄簱缂撳瓨鍖�";
detail.WareHouseId = "205";
+ //if (detail.Quantity <= 0)
+ //{
+ // boxingInfo.BoxingInfoDetails.Remove(detail);
+ //}
}
}
boxingInfos.Add(boxingInfo);
@@ -465,7 +469,7 @@
foreach (var item in boxingInfo.BoxingInfoDetails)
{
- var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
+ var ERPStock = SqlSugarHelper.DBERPtext.Queryable<鐢ㄥ弸鍗虫椂搴撳瓨_ST>().Where(x => x.瀛樺偍鍦扮偣鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName && x.搴撳瓨鏁伴噺 >= item.Quantity).ToList().FirstOrDefault();
if (ERPStock == null)
{
return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
@@ -535,8 +539,8 @@
}
var taskDTO = CreateListTaskDTO(taskNew);
- var result1 = UpdateLocationStatus(StartAddress, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- var result2 = UpdateLocationStatus(Endlocation, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result1 = UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ var result2 = UpdateLocationStatus(Endlocation, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -762,6 +766,10 @@
List<Dt_OrderOutDetails> outDetails = new List<Dt_OrderOutDetails>();
details.Where(x => x.OutboundQuantity > 0).ForEach(x =>
{
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
+ }
outDetails.Add(new Dt_OrderOutDetails()
{
OrderNo = "",
@@ -793,7 +801,7 @@
}
catch (Exception ex)
{
- return content.Error();
+ return content.Error(ex.Message);
}
}
@@ -835,6 +843,10 @@
if (areaName == null)
{
throw new Exception($"鏈壘鍒拌皟鎷ㄤ粨搴搟x.Remark}鏁版嵁");
+ }
+ if (x.Quantity < x.OutboundQuantity)
+ {
+ throw new Exception($"{x.MaterielName}{x.MaterielCode}鍑哄簱鏁伴噺涓嶅彲澶т簬搴撳瓨鏁伴噺");
}
outDetails.Add(new Dt_OrderOutDetails()
{
@@ -1374,6 +1386,29 @@
}
#endregion
+ #region 鑾峰彇浠诲姟鏁版嵁
+ public async Task<WebResponseContent> GetTaskData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryData(x => true);
+ Dictionary<string,object> obj=new Dictionary<string, object>()
+ {
+ {"name","宸插畬鎴�"},
+ };
+
+
+ return content.OK(data:obj);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ #endregion
+
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
@@ -1441,7 +1476,7 @@
{
PickListID = item.ERPOrderId,
//瀛樺偍鍦扮偣
- WhCode = item.WareHouseId,
+ WhCode = "205",
//棰嗘枡鏁伴噺
IssueQty = item.OutboundQuantity,
}).ToList()
@@ -1546,11 +1581,11 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//璋冨叆浠撳簱鍦板潃
- TransInWHCode = "107",
+ TransInWHCode = "205",
//璋冨叆鏁伴噺
TransInQty = item.Quantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = "205",
+ TransOutWHCode = "107",
}).ToList()
};
var Allocate = GetERPIPAddress(SysConfigConst.ERPIPAddress, SysConfigConst.Allocate);
@@ -1591,7 +1626,7 @@
//璋冨叆鏁伴噺
TransInQty = x.OutboundQuantity,
// 璋冨嚭浠撳簱缂栫爜
- TransOutWHCode = x.WareHouseId,
+ TransOutWHCode = "205",
});
});
Allocate allocate = new Allocate
@@ -1645,7 +1680,7 @@
OrgCode = "102",
UserCode = "MH0551"
},
- documentTypeCode = "TransIn002",
+ documentTypeCode = "MiscShip001",
businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
isApproved = true,
@@ -1654,9 +1689,10 @@
//鐗╂枡缂栫爜
ItemCode = item.MaterielCode,
//瀛樺偍鍦扮偣缂栧彿
- WhCode = item.WareHouseId,
+ WhCode = "205",
//鏉傚彂鏁伴噺
Qty = item.OutboundQuantity,
+
BenefitDeptCode = "0505",
}).ToList()
};
--
Gitblit v1.9.3