From 770b80efd437680e84a674ddf3db90037a833f47 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 23 十月 2025 12:34:54 +0800
Subject: [PATCH] 添加库存信息和批次信息的可用库存数量
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 32 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index 5932661..1d72719 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -20,8 +20,10 @@
{
public class InventoryServices : ServiceBase<Dt_Inventory, IRepository<Dt_Inventory>>, IInventoryServices
{
- public InventoryServices(IRepository<Dt_Inventory> BaseDal) : base(BaseDal)
+ private readonly IDeliveryOrderServices _deliveryOrderServices;
+ public InventoryServices(IRepository<Dt_Inventory> BaseDal, IDeliveryOrderServices deliveryOrderServices) : base(BaseDal)
{
+ _deliveryOrderServices = deliveryOrderServices;
}
@@ -38,34 +40,33 @@
try
{
var url = "http://121.37.118.63/GYZ2/95fck/repositoryInfo";
- // 鍙戣捣璇锋眰
- var result = HttpHelper.Post(url, new { goods_no,batch_num}.ToJsonString());
+ var result = HttpHelper.Post(url, new { goods_no, batch_num }.ToJsonString());
- // 鍙嶅簭鍒楀寲
var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
- if (response.resultCode!="0")
+ if (response.resultCode != "0")
{
- // 璋冪敤寮傚父鎺ュ彛
SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
}
+
if (response.data == null || !response.data.Any())
{
return responseContent.OK("鏃犳柊搴撳瓨鏁版嵁");
}
+
Db.Ado.BeginTran();
foreach (var item in response.data)
{
- var Inver = new Dt_Inventory
- {
- Goods_no = item.goods_no,
- Batch_num = item.batch_num,
- Exp_date=item.exp_date,
- Business_qty = item.business_qty,
- Actual_qty = item.actural_qty,
- };
- AddData(Inver);
+ // 浣跨敤 FirstOrDefault 閬垮厤鎵句笉鍒拌褰曟椂鎶涘嚭寮傚父
+ var Inver = Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+
+ if (Inver != null)
+ {
+ Inver.ERPStockQuantity = item.business_qty;
+ Db.Updateable(Inver).ExecuteCommand();
+ }
}
Db.Ado.CommitTran();
return responseContent.OK("搴撳瓨淇℃伅鍚屾瀹屾垚");
@@ -90,26 +91,29 @@
public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
{
try
- {
+ {
// 1锔忊儯 鏍￠獙璇锋眰
if (request == null || request.details == null || !request.details.Any())
{
return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "璇锋眰鍙傛暟鏃犳晥" };
}
- // 2锔忊儯 寮�鍚簨鍔�
- BaseDal.Db.Ado.BeginTran();
+ //鏌ユ壘鍒板叏閮ㄧ殑
foreach (var detail in request.details)
{
- // 3锔忊儯 璁＄畻鍏ュ簱鏁伴噺锛堝彇姝ｏ級
+ var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();
+
+ // 3锔� 璁＄畻鍏ュ簱鏁伴噺锛堝彇姝ｏ級閬嶅巻 orderDetails 涓殑姣忎釜 EdiOrderBoxDto 瀵硅薄
decimal orderQty = detail.orderDetails?
.Sum(x => decimal.TryParse(x.quantity, out var q) ? Math.Abs(q) : 0)
?? 0;
// 5锔忊儯 鏌ヨ搴撳瓨璇︽儏
var entity = BaseDal.Db.Queryable<Dt_InventoryInfo>()
- .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo);
+ .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.LocationCode == "绔嬪簱");
+ //鏌ヨ鐗╂枡琛�
+ var Goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().First(x => x.MaterielCode == detail.productCode);
if (entity == null)
{
@@ -117,7 +121,7 @@
{
PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
WarehouseCode = "001",
- LocationCode = "",
+ LocationCode = "绔嬪簱",
StockStatus = 1,
MaterielCode = detail.productCode ?? detail.productName,
MaterielName = detail.productName ?? "",
@@ -126,6 +130,7 @@
StockQuantity = 0,
OutboundQuantity = 0,
SupplyQuantity = 0,
+ AvailableQuantity = 0,
InDate = DateTime.Now,
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
ShelfLife = 0,
@@ -148,6 +153,7 @@
BatchNo = detail.batchNo,
StockQuantity = 0,
OutboundQuantity = 0,
+ AvailableQuantity = 0,
SupplyQuantity = 0,
ERPStockQuantity = 0,
Status = false,
@@ -161,38 +167,50 @@
switch (request.orderType)
{
case "1": //鍏ュ簱
- entity.StockQuantity += orderQty;
+ entity.StockQuantity = orderQty; //瀹為檯搴撳瓨
+ entity.AvailableQuantity = orderQty;
entity.InDate = DateTime.Now;
entity.Remark = "鍏ュ簱鍗曞洖浼�";
- batch.StockQuantity += orderQty;
+
+ batch.StockQuantity = orderQty;
+ batch.AvailableQuantity = orderQty;
batch.Remark = "鍏ュ簱鍗曞洖浼�";
+ UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
break;
- case "2": // 鍑哄簱
- entity.OutboundQuantity += orderQty;
- entity.StockQuantity -= orderQty;
+ case "2": // 鍑哄簱 鎬�100 鍑�20
+ decimal actualOutQty = entity.StockQuantity - orderQty;// 璁＄畻鏈瀹為檯鍑哄簱鏁伴噺 20
+ entity.StockQuantity=orderQty; //瀹為檯搴撳瓨鏁� 100
+ entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //寰呭嚭搴撴暟閲�
+ entity.AvailableQuantity = entity.StockQuantity - entity.OutboundQuantity;//鍙敤搴撳瓨
if (entity.StockQuantity < 0) entity.StockQuantity = 0;
entity.Remark = "鍑哄簱鍗曞洖浼�";
- batch.OutboundQuantity += orderQty;
- batch.StockQuantity -= orderQty;
+
+ batch.StockQuantity = orderQty;
+ batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//寰呭嚭搴撴暟閲�
+ batch.AvailableQuantity = batch.StockQuantity - batch.OutboundQuantity; //鍙敤搴撳瓨
if (batch.StockQuantity < 0) batch.StockQuantity = 0;
batch.Remark = "鍑哄簱鍗曞洖浼�";
+ UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);
+ //璋冩嫧浠诲姟
+ _deliveryOrderServices.CreateAllocatInOut(goods);
break;
case "3": // 鐩樼偣
decimal diff = detail.ea ?? 0; // 宸紓鏁�
int flag = detail.isLossOrProfit ?? 3; // 1=鐩樹簭, 2=鐩樼泩, 3=鐩樹腑
-
if (flag == 1) // 鐩樹簭
{
- batch.SupplyQuantity = batch.StockQuantity - diff;
+ //搴撳瓨鏁�-宸紓鏁�=鐩樹簭
+ batch.SupplyQuantity +=( batch.StockQuantity - diff);
batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樹簭";
}
else if (flag == 2) // 鐩樼泩
{
- batch.SupplyQuantity = batch.StockQuantity + diff;
+ //搴撳瓨鏁�+宸紓鏁�=鐩樼泩
+ batch.SupplyQuantity +=(batch.StockQuantity + diff);
batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樼泩";
}
else // 鐩樹腑
@@ -201,7 +219,8 @@
}
break;
}
-
+ // 2锔忊儯 寮�鍚簨鍔�
+ BaseDal.Db.Ado.BeginTran();
// 8锔忊儯 淇濆瓨鏁版嵁
if (entity.Id == 0)
BaseDal.Db.Insertable(entity).ExecuteCommand();
@@ -237,6 +256,54 @@
}
+ /// <summary>
+ /// 鏇存柊鍏ュ簱鍗曡缁�
+ /// </summary>
+ /// <param name="batchNo">鎵规鍙�</param>
+ /// <param name="productCode">鐗╂枡鍚嶇紪鐮�/param>
+ public void UpdateInboundOrderDetailStatus(string batchNo,string productCode)
+ {
+ try
+ {
+ //鏌ヨ璇︽儏
+ var detail = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
+ .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OrderDetailStatus == "寮�濮�" && x.Status == 1);
+ //鏌ユ壘鍒板悗鏍规嵁鐗╂枡鐘舵�侊紙OrderDetailStatus==寮�濮嬶級 璇ョ姸鎬丼tatus=1淇敼璇ユ潯璇︽儏鐨凮rderDetailStatus==宸插畬鎴�
+ detail.OrderDetailStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(detail).ExecuteCommand();
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
+
+ }
+
+ /// <summary>
+ /// //鏌ユ壘鍒板悗鏍规嵁鐗╂枡鐘舵�侊紙OrderDetailStatus==寮�濮嬶級 璇ョ姸鎬丼tatus=1淇敼璇ユ潯璇︽儏鐨凮rderDetailStatus==宸插畬鎴�
+ /// </summary>
+ /// <param name="batchNo"></param>
+ /// <param name="productCode"></param>
+ public void UpdateOutboundOrderDetailStatus(string batchNo, string productCode)
+ {
+ try
+ {
+ //鏌ヨ璇︽儏
+ var detail = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
+ .First(x => x.Goods_no == productCode && x.Batch_num == batchNo && x.OotDetailStatus == "寮�濮�" && x.Status == 1);
+ detail.OotDetailStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(detail).ExecuteCommand();
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
+
+
+ }
+
/// <summary>
/// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨
--
Gitblit v1.9.3