From aa5a0ac9a7d35d3a072fbe164ded24adbaa68b17 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 04 十一月 2025 12:29:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 595 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 460 insertions(+), 135 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..ec8fbe9 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"
@@ -1,16 +1,19 @@
锘縰sing HslCommunication;
using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using SqlSugar;
+using WIDESEA_Common;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.SquareCabin;
using WIDESEA_ISquareCabinServices;
+using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
using static WIDESEA_DTO.SquareCabin.OrderDto;
using static WIDESEA_DTO.SquareCabin.TowcsDto;
@@ -20,10 +23,19 @@
{
public class InventoryServices : ServiceBase<Dt_Inventory, IRepository<Dt_Inventory>>, IInventoryServices
{
- public InventoryServices(IRepository<Dt_Inventory> BaseDal) : base(BaseDal)
+ private readonly ICabinOrderServices _cabinOrderServices;
+ private readonly IDeliveryOrderServices _deliveryOrderServices;
+ private readonly ISupplyTaskService _supplyTaskService;
+ private readonly IInventory_BatchServices _inventoryBatchServices;
+ private readonly IMessageInfoService _infoService;
+ public InventoryServices(IRepository<Dt_Inventory> BaseDal, ICabinOrderServices cabinOrderServices, IDeliveryOrderServices deliveryOrderServices, ISupplyTaskService supplyTaskService, IInventory_BatchServices inventoryBatchServices, IMessageInfoService infoService) : base(BaseDal)
{
+ _cabinOrderServices = cabinOrderServices;
+ _deliveryOrderServices = deliveryOrderServices;
+ _supplyTaskService = supplyTaskService;
+ _inventoryBatchServices = inventoryBatchServices;
+ _infoService = infoService;
}
-
/// <summary>
/// 鑾峰彇涓婃父搴撳瓨淇℃伅
@@ -32,62 +44,149 @@
/// <param name="batch_num">鎵瑰彿</param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public WebResponseContent GetInventoryList(string goods_no, string batch_num)
+ public WebResponseContent GetInventoryList(int[] key)
{
var responseContent = new WebResponseContent();
try
{
- var url = "http://121.37.118.63/GYZ2/95fck/repositoryInfo";
- // 鍙戣捣璇锋眰
- var result = HttpHelper.Post(url, new { goods_no,batch_num}.ToJsonString());
- // 鍙嶅簭鍒楀寲
- var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
+ List<Dt_Inventory_Batch> UpdateBatches = new List<Dt_Inventory_Batch>();
+ //鏍规嵁id鏌ヨ搴撳瓨鎵规淇℃伅琛紝鑾峰彇鍒颁粬浠殑鍟嗗搧缂栫爜鍜屾壒娆″彿
+ var inventoryBatches = _inventoryBatchServices.Repository.QueryData(); //鏌ュ叏閮�
- if (response.resultCode!="0")
+ var inventory = inventoryBatches.Where(x => key.Contains(x.Id)).Select(x => new { x.MaterielCode, x.BatchNo }).ToList();
+ if (inventory.Count < 1)
{
- // 璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(8, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
+ return WebResponseContent.Instance.Error("娌℃湁鎵惧埌搴撳瓨鎵规淇℃伅");
}
- if (response.data == null || !response.data.Any())
+
+ var requestData = inventory.Select(x => new { goods_no = x.MaterielCode, batch_num = x.BatchNo }).Distinct().ToList();
+
+ foreach (var item in requestData)
{
- return responseContent.OK("鏃犳柊搴撳瓨鏁版嵁");
+
+ var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/370999979?apifoxApiId=370999979";
+ var result = HttpHelper.Post(url, new { item.goods_no, item.batch_num }.ToJsonString());
+
+ var response = JsonConvert.DeserializeObject<UpstreamResponse<InventoryInfo>>(result);
+
+ if (response.resultCode != "0")
+ {
+ //return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
+ _infoService.AddMessageInfo(MessageGroupByEnum.SynchronismAlarm, "Erp鍚屾澶辫触", "涓婃父鎺ュ彛杩斿洖澶辫触");
+ continue;
+
+ }
+
+ if (response.data == null || !response.data.Any())
+ {
+ return responseContent.OK("鏃犳柊搴撳瓨鏁版嵁");
+ }
+ var materialCodes = response.data.Select(x => x.goods_no).Distinct().ToList();
+ var batchNos = response.data.Select(x => x.batch_num).Distinct().ToList();
+ foreach (var inventoryInfo in response.data)
+ {
+ //// 浣跨敤 FirstOrDefault 閬垮厤鎵句笉鍒拌褰曟椂鎶涘嚭寮傚父
+ var Inver = inventoryBatches.FirstOrDefault(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+
+ if (Inver != null)
+ {
+ Inver.ERPStockQuantity = inventoryInfo.business_qty;
+ UpdateBatches.Add(Inver);
+ }
+ }
}
- 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);
- }
- Db.Ado.CommitTran();
+ _inventoryBatchServices.UpdateData(UpdateBatches);
return responseContent.OK("搴撳瓨淇℃伅鍚屾瀹屾垚");
+
}
catch (Exception ex)
{
- Db.Ado.RollbackTran();
- SendErrorToUpstream(8, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
+
-
-
+ public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
+ {
+ try
+ {
+ if (request == null || request.details == null || request.details.Count < 1) throw new Exception("璇锋眰鍙傛暟鏃犳晥");
+ var Warecode = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ switch (request.orderType)
+ {
+ case "1": //鍏ュ簱
+ {
+ Dt_CabinOrder cabinOrder = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.externalOrderNo && x.Warehouse_no == Warecode).Includes(x => x.Details).First();
+ if (cabinOrder == null) throw new Exception($"鏈壘鍒板叆搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍏ュ簱鍗曚俊鎭�");
+ if (cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return new ApiResponse<Dt_InventoryInfo> { code = "0", msg = $"鎴愬姛" };
+ WebResponseContent content = _cabinOrderServices.CompleteLKInOrder(cabinOrder, request);
+ if (!content.Status) throw new Exception(content.Message);
+ }
+ break;
+ case "2":
+ {
+ Dt_DeliveryOrder deliveryOrder = _deliveryOrderServices.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.externalOrderNo && x.Warehouse_no == Warecode).Includes(x => x.Details).First();
+ if (deliveryOrder == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍑哄簱鍗曚俊鎭�");
+ if (deliveryOrder.OutStatus == "宸插畬鎴�")
+ return new ApiResponse<Dt_InventoryInfo> { code = "0", msg = $"鎴愬姛" };
+ WebResponseContent content = _deliveryOrderServices.CompleteLKOutOrder(deliveryOrder, request);
+ if (!content.Status) throw new Exception(content.Message);
+ }
+ break;
+ case "3":
+ {
+ #region 鎵剧洏鐐逛换鍔�
+ List<Dt_SupplyTask> supplyTasks = _supplyTaskService.Repository.QueryData(x => x.OrderNo == request.externalOrderNo && x.WarehouseCode == Warecode && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt());
+ foreach (var detail in request.details)
+ {
+ Dt_SupplyTask? supplyTask = supplyTasks.Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo).FirstOrDefault();
+ if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.externalOrderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鐩樼偣浠诲姟");
+ if (detail.isLossOrProfit == 1) // 鐩樹簭
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity - detail.ea;
+ }
+ else if (detail.isLossOrProfit == 2) // 鐩樼泩
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity + detail.ea;
+ }
+ else // 鐩樹腑
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity;
+ }
+ var content = _deliveryOrderServices.CheckTaskFinish(supplyTask);
+ if (!content.Status) throw new Exception(content.Message);
+ }
+ #endregion
+ }
+ break;
+ default:
+ throw new Exception($"鏈畾涔夌殑绫诲瀷銆恵request.orderType}銆�");
+ }
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "0",
+ msg = $"鎴愬姛"
+ };
+ }
+ catch (Exception ex)
+ {
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "500",
+ msg = $"澶勭悊澶辫触: {ex.Message}"
+ };
+ }
+ }
/// <summary>
/// wcs鍥炰紶缁欐垜璋冪敤鎴戠殑鏂规硶 涓嶇鏄叆搴� 鍑哄簱 鐩樼偣閮戒細璋冪敤杩欎釜鎺ュ彛
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
- public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
+ public ApiResponse<Dt_InventoryInfo> OrderFeedback1(EdiOrderCallbackRequest request)
{
try
{
@@ -96,126 +195,302 @@
{
return new ApiResponse<Dt_InventoryInfo> { code = "500", msg = "璇锋眰鍙傛暟鏃犳晥" };
}
-
+ var reslut = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
// 2锔忊儯 寮�鍚簨鍔�
- BaseDal.Db.Ado.BeginTran();
-
+ //BaseDal.Db.Ado.BeginTran();
foreach (var detail in request.details)
{
- // 3锔忊儯 璁＄畻鍏ュ簱鏁伴噺锛堝彇姝ｏ級
+ #region 鏌ヨ鐗╂枡淇℃伅銆佽绠楁�诲拰
+ //鏌ヨ鐗╂枡琛�
+ var goods = Db.Queryable<Dt_MaterielInfo>().Where(x => x.MaterielCode == detail.productCode).First();
+ if (goods == null) throw new Exception($"鏈壘鍒扮墿鏂欑紪鐮併�恵detail.productCode}銆戠殑鐗╂枡淇℃伅");
+ // 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);
-
- if (entity == null)
- {
- entity = new Dt_InventoryInfo
- {
- 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 = "鑷姩鍒涘缓"
- };
- }
+ #endregion
// 7锔忊儯 鎸夎鍗曠被鍨嬫墽琛屼笉鍚岄�昏緫
switch (request.orderType)
{
case "1": //鍏ュ簱
- entity.StockQuantity += orderQty;
- entity.InDate = DateTime.Now;
- entity.Remark = "鍏ュ簱鍗曞洖浼�";
+ {
+ #region 澶勭悊鍏ュ簱璁㈠崟
- batch.StockQuantity += orderQty;
- batch.Remark = "鍏ュ簱鍗曞洖浼�";
+ Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ if (cabinOrder == null) throw new Exception($"鏈壘鍒板叆搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍏ュ簱鍗曚俊鎭�");
+ #region 鍒ゆ柇鏄惁涓虹洏鐩堝叆搴撳崟
+ if (cabinOrder.Order_type == "5")
+ {
+ foreach (var item in cabinOrder.Details)
+ {
+ Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
+ .First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
+ var qty = inventoryInfo.SupplyQuantity - inventoryInfo.StockQuantity;
+ if (orderQty != qty)
+ throw new Exception($"鐩樼泩鍏ュ簱鏁伴噺涓嶄竴鑷�,涓婁紶鏁伴噺銆恵orderQty}銆�,搴撳瓨鐩樼泩鏁伴噺銆恵qty}銆�");
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ #region 娣诲姞鐩樼泩鍏ュ簱浠诲姟
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = cabinOrder.Order_no,
+ StockQuantity = orderQty,
+ SupplyQuantity = 0,
+ Remark = "鐩樼泩鍏ュ簱"
+ };
+ #endregion
+ var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ item.OrderDetailStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(item).ExecuteCommand();
+ BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
+ BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
+ BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
+ }
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
+ if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "宸插畬鎴�").Any())
+ cabinOrder.OdrderStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
+ }
+ #endregion
+ else
+ {
+ if (cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return new ApiResponse<Dt_InventoryInfo>
+ {
+ code = "0",
+ msg = "鎴愬姛"
+ };
+ Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == detail.productCode && x.Batch_num == detail.batchNo && x.Status == 1).First();
+ if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
+ throw new Exception($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
+ cabinOrderDetail.Order_Inqty += orderQty;
+ if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
+ throw new Exception($"鍏ュ簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+ cabinOrder.OdrderStatus = "寮�濮�";
+ cabinOrderDetail.OrderDetailStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
+ cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(cabinOrderDetail).ExecuteCommand();
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "宸插畬鎴�").Any())
+ cabinOrder.OdrderStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
+ #endregion
+
+ #region 鍒涘缓搴撳瓨淇℃伅
+ // 5锔忊儯 鏌ヨ搴撳瓨璇︽儏
+ var inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
+ .First(x => x.MaterielCode == cabinOrderDetail.Goods_no && x.BatchNo == cabinOrderDetail.Batch_num && x.LocationCode == "绔嬪簱");
+ if (inventoryInfo != null)
+ {
+ inventoryInfo.StockQuantity += orderQty;
+ inventoryInfo.AvailableQuantity += orderQty;
+ inventoryInfo.InDate = DateTime.Now;
+ BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
+ }
+ else
+ {
+ inventoryInfo = new Dt_InventoryInfo
+ {
+ PalletCode = detail.orderDetails?.FirstOrDefault()?.palletCode ?? "",
+ WarehouseCode = "001",
+ LocationCode = "绔嬪簱",
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ MaterielCode = goods.MaterielCode,
+ MaterielName = goods.MaterielName,
+ MaterielSpec = goods.MaterielSpec,
+ BatchNo = detail.batchNo,
+ StockQuantity = orderQty,
+ OutboundQuantity = 0,
+ SupplyQuantity = 0,
+ AvailableQuantity = orderQty,
+ InDate = DateTime.Now,
+ ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
+ ShelfLife = 0,
+ ValidityPeriod = cabinOrderDetail.Exp_date,
+ Remark = "鏅鸿兘绔嬪簱"
+ };
+ BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
+ }
+ #endregion
+
+ #region 鍒涘缓搴撳瓨鎵规淇℃伅 鍙湁涓嶆槸璋冩嫧鍏ュ簱鍗曪紙115锛夋墠瀵规壒娆′俊鎭繘琛屼慨鏀�
+ if (cabinOrder.Order_type != InOrderTypeEnum.Allocat.ObjToInt().ToString())
+ {
+ // 6锔忊儯 鏌ヨ搴撳瓨鎵规淇℃伅
+ var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
+
+ if (inventory_Batch != null)
+ {
+ inventory_Batch.StockQuantity += orderQty;
+ inventory_Batch.AvailableQuantity += orderQty;
+ BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
+ }
+ else
+ {
+ inventory_Batch = new Dt_Inventory_Batch
+ {
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ BatchNo = inventoryInfo.BatchNo,
+ StockQuantity = inventoryInfo.StockQuantity,
+ OutboundQuantity = inventoryInfo.OutboundQuantity,
+ AvailableQuantity = inventoryInfo.AvailableQuantity,
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ ERPStockQuantity = 0,
+ Status = false,
+ ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
+ Remark = "鑷姩鍒涘缓"
+ };
+ BaseDal.Db.Insertable(inventory_Batch).ExecuteCommand();
+ }
+ }
+ #endregion
+
+ #region 娣诲姞鍏ュ簱浠诲姟鍘嗗彶
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ TaskNum = cabinOrderDetail.Id,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = cabinOrder.Order_no,
+ StockQuantity = orderQty,
+ SupplyQuantity = 0,
+ Remark = "鍏ュ簱"
+ };
+ //杩欓噷杩欓噷鐨勫叆搴撹皟鎷ㄥ崟鐘舵�佹槸115锛屽氨灏嗚皟鎷ㄤ换鍔＄姸鎬佹敼涓�7
+ if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString()) supplyTask_Hty.TaskType = TaskTypeEnum.AllocatIn.ObjToInt();
+ BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
+ #endregion
+ }
+ }
break;
+ case "2":
+ {
+ Dt_DeliveryOrder cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == request.externalOrderNo && x.Warehouse_no == reslut).Includes(x => x.Details).First();
+ if (cabinOrder == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵request.externalOrderNo}銆戠殑鍑哄簱鍗曚俊鎭�");
- case "2": // 鍑哄簱
- entity.OutboundQuantity += orderQty;
- entity.StockQuantity -= orderQty;
- if (entity.StockQuantity < 0) entity.StockQuantity = 0;
- entity.Remark = "鍑哄簱鍗曞洖浼�";
+ if (cabinOrder.Out_type == "6")
+ {
+ foreach (var item in cabinOrder.Details)
+ {
+ Dt_InventoryInfo inventoryInfo = BaseDal.Db.Queryable<Dt_InventoryInfo>()
+ .First(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num && x.LocationCode == reslut);
+ var qty = inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity;
+ if (orderQty != qty)
+ throw new Exception($"鐩樹簭鍑哄簱鏁伴噺涓嶄竴鑷�,涓婁紶鏁伴噺銆恵orderQty}銆�,搴撳瓨鐩樹簭鏁伴噺銆恵qty}銆�");
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = cabinOrder.Out_no,
+ StockQuantity = orderQty,
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍑哄簱"
+ };
+ #endregion
+ var inventory_Batch = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .First(x => x.MaterielCode == inventoryInfo.MaterielCode && x.BatchNo == inventoryInfo.BatchNo);
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ item.OotDetailStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(item).ExecuteCommand();
+ BaseDal.Db.Updateable(inventoryInfo).ExecuteCommand();
+ BaseDal.Db.Updateable(inventory_Batch).ExecuteCommand();
+ BaseDal.Db.Insertable(supplyTask_Hty).ExecuteCommand();
+ }
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Id == cabinOrder.Id).Includes(x => x.Details).First();
+ if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "宸插畬鎴�").Any())
+ cabinOrder.OutStatus = "宸插畬鎴�";
+ BaseDal.Db.Updateable(cabinOrder).ExecuteCommand();
+ }
+ else
+ {
+ #region 鎵惧嚭搴撲换鍔�
+ Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == reslut && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt()).First();
+ if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.externalOrderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鍑哄簱浠诲姟");
+ if (supplyTask.StockQuantity != orderQty) throw new Exception($"璁㈠崟鍙枫�恵request.orderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鍑哄簱鏁伴噺涓庡嚭搴撲换鍔℃暟閲忎笉鐩哥瓑");
+ #endregion
- batch.OutboundQuantity += orderQty;
- batch.StockQuantity -= orderQty;
- if (batch.StockQuantity < 0) batch.StockQuantity = 0;
- batch.Remark = "鍑哄簱鍗曞洖浼�";
+ #region 澶勭悊鍑哄簱鍗曘�佸簱瀛樹俊鎭�佸嚭搴撲换鍔°�佽皟鎷ㄤ换鍔�
+ var content = _deliveryOrderServices.OutTaskFinish(supplyTask);
+ if (!content.Status) throw new Exception(content.Message);
+ #endregion
+ }
+ }
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.Remark = "鐩樼偣鍗曞洖浼� - 鐩樹簭";
- }
- else if (flag == 2) // 鐩樼泩
- {
- batch.SupplyQuantity = batch.StockQuantity + diff;
- batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樼泩";
- }
- else // 鐩樹腑
- {
- batch.Remark = "鐩樼偣鍗曞洖浼� - 鐩樹腑";
+ var WarehouseLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ #region 鎵剧洏鐐逛换鍔�
+ Dt_SupplyTask supplyTask = Db.Queryable<Dt_SupplyTask>().Where(x => x.MaterielCode == detail.productCode && x.BatchNo == detail.batchNo && x.OrderNo == request.externalOrderNo && x.WarehouseCode == WarehouseLK && x.TaskStatus == SupplyStatusEnum.NewCheck.ObjToInt()).First();
+ if (supplyTask == null) throw new Exception($"鏈壘鍒拌鍗曞彿銆恵request.externalOrderNo}銆戠墿鏂欑紪鍙枫�恵detail.productCode}銆戠殑鐩樼偣浠诲姟");
+ #endregion
+ if (detail.isLossOrProfit == 1) // 鐩樹簭
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity - detail.ea;
+ }
+ else if (detail.isLossOrProfit == 2) // 鐩樼泩
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity + detail.ea;
+ }
+ else // 鐩樹腑
+ {
+ supplyTask.SupplyQuantity = supplyTask.StockQuantity;
+ }
+ var content = _deliveryOrderServices.CheckTaskFinish(supplyTask);
+ if (!content.Status) throw new Exception(content.Message);
}
break;
}
-
- // 8锔忊儯 淇濆瓨鏁版嵁
- if (entity.Id == 0)
- BaseDal.Db.Insertable(entity).ExecuteCommand();
- else
- BaseDal.Db.Updateable(entity).ExecuteCommand();
-
- if (batch.Id == 0)
- BaseDal.Db.Insertable(batch).ExecuteCommand();
- else
- BaseDal.Db.Updateable(batch).ExecuteCommand();
}
// 9锔忊儯 鎻愪氦浜嬪姟
- BaseDal.Db.Ado.CommitTran();
+ //BaseDal.Db.Ado.CommitTran();
return new ApiResponse<Dt_InventoryInfo>
{
@@ -226,17 +501,67 @@
catch (Exception ex)
{
// 馃敓 鍥炴粴浜嬪姟
- BaseDal.Db.Ado.RollbackTran();
+ //BaseDal.Db.Ado.RollbackTran();
return new ApiResponse<Dt_InventoryInfo>
{
code = "500",
msg = $"澶勭悊澶辫触: {ex.Message}"
};
+
+ //Console.WriteLine(ex.Message);
}
}
+ /// <summary>
+ /// 鏇存柊鍏ュ簱鍗曡缁�
+ /// </summary>
+ /// <param name="batchNo">鎵规鍙�</param>
+ /// <param name="productCode">鐗╂枡鍚嶇紪鐮�/param>
+ public void UpdateInboundOrderDetailStatus(string orderNo, 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