From 614945e153d38d1dadf5beb1e1d4dbc6db07c226 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 20 十月 2025 03:17:53 +0800
Subject: [PATCH] 优化出入库
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 211 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 141 insertions(+), 70 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 248a7fe..2daa804 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("搴撳瓨淇℃伅鍚屾瀹屾垚");
@@ -79,100 +80,170 @@
}
+
+
+
/// <summary>
- /// wcs鍥炰紶缁欐垜璋冪敤鎴戠殑鏂规硶
+ /// wcs鍥炰紶缁欐垜璋冪敤鎴戠殑鏂规硶 涓嶇鏄叆搴� 鍑哄簱 鐩樼偣閮戒細璋冪敤杩欎釜鎺ュ彛
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
- public ApiResponse<Dt_Inventory> OrderFeedback(EdiOrderCallbackRequest request)
+ public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
{
try
{
+ // 1锔忊儯 鏍￠獙璇锋眰
if (request == null || request.details == null || !request.details.Any())
{
- return new ApiResponse<Dt_Inventory> { code = "500", msg = "璇锋眰鍙傛暟鏃犳晥" };
+ return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "璇锋眰鍙傛暟鏃犳晥" };
}
- BaseDal.Db.Ado.BeginTran();//寮�鍚簨鍔�
+
foreach (var detail in request.details)
{
- // 鍏堟煡搴撳瓨鏄惁瀛樺湪锛堟寜鐓т骇鍝佺紪鍙峰拰鎵规鏉ュ鎵撅級
- var entity = BaseDal.Db.Queryable<Dt_Inventory>()
- .First(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo);
- //灏嗛泦鍚堜腑鐨勬暟閲忚繘琛岀疮鍔�
- // 瀹夊叏杞崲
+ var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();
- //姝ｅ父鍑哄叆搴�
- decimal orderQty = detail.orderDetails?.Sum(x => decimal.TryParse(x.quantity, out var q) ? q : 0) ?? 0;
- //鐩樼偣鐩樹簭
- decimal diffQty = detail.stocktakingDetails?.Sum(x => Convert.ToDecimal(x.differenceQuantity)) ?? 0;
+ // 3锔忊儯 璁＄畻鍏ュ簱鏁伴噺锛堝彇姝ｏ級
+ 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&&x.LocationCode=="绔嬪簱");
+ //鏌ヨ鐗╂枡琛�
+ var Goods = BaseDal.Db.Queryable<Dt_MaterielInfo>().First(x => x.MaterielCode == detail.productCode);
+
if (entity == null)
{
- // 濡傛灉涓嶅瓨鍦紝鏂板缓涓�鏉�
- entity = new Dt_Inventory
+ entity = new Dt_InventoryInfo
{
- Goods_no = detail.productCode ?? detail.productName,
- Reservoirarea = "榛樿搴撳尯",
- Batch_num = detail.batchNo,
- //涓氬姟搴撳瓨
- Business_qty = 0,
- //瀹為檯搴撳瓨
- Actual_qty = 0
+ PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
+ WarehouseCode = "001",
+ LocationCode = "绔嬪簱",
+ StockStatus = 1,
+ MaterielCode = detail.productCode ?? detail.productName,
+ MaterielName = detail.productName ?? "",
+ MaterielSpec = detail.productSpecifications ?? "",
+ BatchNo = detail.batchNo,
+ StockQuantity = 0,
+ OutboundQuantity = 0,
+ SupplyQuantity = 0,
+ InDate = DateTime.Now,
+ ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
+ ShelfLife = 0,
+ ValidityPeriod = "",
+ Remark = "WCS鍥炰紶鍒涘缓"
};
}
+ // 6锔忊儯 鏌ヨ搴撳瓨鎵规淇℃伅
+ var batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo);
+
+ if (batch == null)
+ {
+ batch = new Dt_Inventory_Batch
+ {
+ MaterielCode = detail.productCode ?? detail.productName,
+ MaterielName = detail.productName ?? "",
+ MaterielSpec = detail.productSpecifications ?? "",
+ BatchNo = detail.batchNo,
+ StockQuantity = 0,
+ OutboundQuantity = 0,
+ SupplyQuantity = 0,
+ ERPStockQuantity = 0,
+ Status = false,
+ ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
+ ValidityPeriod = DateTime.Now.AddYears(1).ToString("yyyy-MM-dd"),
+ Remark = "鑷姩鍒涘缓"
+ };
+ }
+
+ // 7锔忊儯 鎸夎鍗曠被鍨嬫墽琛屼笉鍚岄�昏緫
switch (request.orderType)
{
- case "1": // 鍏ュ簱
- entity.Business_qty += orderQty;
- entity.Actual_qty += orderQty;
+ case "1": //鍏ュ簱
+ entity.StockQuantity += orderQty;
+ entity.InDate = DateTime.Now;
+ entity.Remark = "鍏ュ簱鍗曞洖浼�";
+ //Goods.Business_qty=
+
+ batch.StockQuantity += orderQty;
+ batch.Remark = "鍏ュ簱鍗曞洖浼�";
break;
case "2": // 鍑哄簱
- entity.Business_qty -= orderQty;
- entity.Actual_qty -= orderQty;
- if (entity.Business_qty < 0) entity.Business_qty = 0; // 鍙�夛細闃叉璐熸暟
- if (entity.Actual_qty < 0) entity.Actual_qty = 0;
+ entity.OutboundQuantity += orderQty; //鍑哄簱鏁伴噺
+ entity.StockQuantity -= orderQty;
+ if (entity.StockQuantity < 0) entity.StockQuantity = 0;
+ entity.Remark = "鍑哄簱鍗曞洖浼�";
+
+ //CreateAllocatInOut()
+ batch.OutboundQuantity += orderQty;
+ batch.StockQuantity -= orderQty;
+ if (batch.StockQuantity < 0) batch.StockQuantity = 0;
+ batch.Remark = "鍑哄簱鍗曞洖浼�";
+ //璋冩嫧浠诲姟
+ _deliveryOrderServices.CreateAllocatInOut(goods);
+
+
break;
case "3": // 鐩樼偣
- if (detail.stocktakingDetails != null && detail.stocktakingDetails.Any())
+ decimal diff = detail.ea ?? 0; // 宸紓鏁�
+ int flag = detail.isLossOrProfit ?? 3; // 1=鐩樹簭, 2=鐩樼泩, 3=鐩樹腑
+
+ if (flag == 1) // 鐩樹簭
{
- foreach (var stock in detail.stocktakingDetails)
- {
- //姣忔閮藉彧鎷夸竴鏉℃槑缁嗕腑鐨勬暟閲�
- decimal diff = Convert.ToDecimal(stock.differenceQuantity);
- if (stock.IsProfit == "1") // 鐩樼泩
- {
- entity.Business_qty += diff;//濡傛灉鐩樼泩浜嗗浜嗭紝灏卞皢涓氬姟鏁伴噺+锛岀洏浜忓垯鐩稿弽
- entity.PalletCode = stock.palletCode;
- }
- else // 鐩樹簭
- {
- entity.Business_qty -= diff;
- entity.PalletCode = stock.palletCode;
- }
- }
+ batch.SupplyQuantity = batch.StockQuantity - diff;
+ batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樹簭";
+ }
+ else if (flag == 2) // 鐩樼泩
+ {
+ batch.SupplyQuantity = batch.StockQuantity + diff;
+ batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樼泩";
+ }
+ else // 鐩樹腑
+ {
+ batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樹腑";
}
break;
}
-
- // 淇濆瓨鏁版嵁
- if (entity.Id == 0) // 鏂板缓
+ // 2锔忊儯 寮�鍚簨鍔�
+ BaseDal.Db.Ado.BeginTran();
+ // 8锔忊儯 淇濆瓨鏁版嵁
+ if (entity.Id == 0)
BaseDal.Db.Insertable(entity).ExecuteCommand();
- else // 鏇存柊
+ else
BaseDal.Db.Updateable(entity).ExecuteCommand();
+
+ if (batch.Id == 0)
+ BaseDal.Db.Insertable(batch).ExecuteCommand();
+ else
+ BaseDal.Db.Updateable(batch).ExecuteCommand();
}
- BaseDal.Db.Ado.CommitTran(); // 鎻愪氦浜嬪姟
- return new ApiResponse<Dt_Inventory> { code = "0", msg = "鎴愬姛" };
+
+ // 9锔忊儯 鎻愪氦浜嬪姟
+ BaseDal.Db.Ado.CommitTran();
+
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "0",
+ msg = "鎴愬姛"
+ };
}
catch (Exception ex)
{
- BaseDal.Db.Ado.RollbackTran();//鍥炴粴浜嬪姟
- return new ApiResponse<Dt_Inventory> { code = "500", msg = ex.Message };
+ // 馃敓 鍥炴粴浜嬪姟
+ BaseDal.Db.Ado.RollbackTran();
+
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "500",
+ msg = $"澶勭悊澶辫触: {ex.Message}"
+ };
}
}
-
-
--
Gitblit v1.9.3