From 56827df8730c172c6c654fb78fed073ef8d694cb Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 19:22:39 +0800
Subject: [PATCH] 优化入库单处理
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 703 +++++++++++++++++++++-------------------------------------
1 files changed, 259 insertions(+), 444 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 0c7ff24..f24f1aa 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"
@@ -13,11 +13,13 @@
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_IBasicService;
using WIDESEA_ISquareCabinServices;
using WIDESEA_IWMsInfoServices;
@@ -32,7 +34,6 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
- static string SearchDate = "";
private readonly IBasicService _basicService;
private readonly IMedicineGoodsServices _medicineGoodsServices;
private readonly IUnitOfWorkManage _unitOfWorkManage;
@@ -40,9 +41,10 @@
private readonly IInventoryInfoService _inventoryInfoService;
private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
+ private readonly ISupplyTaskHtyService _supplyTaskHtyService;
public IRepository<Dt_CabinOrder> Repository => BaseDal;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService) : base(BaseDal)
{
_basicService = basicService;
_medicineGoodsServices = medicineGoodsServices;
@@ -51,10 +53,16 @@
_inventoryInfoService = inventoryInfoService;
_cabinOrderDetailServices = cabinOrderDetailServices;
_supplyTaskService = supplyTaskService;
+ _supplyTaskHtyService = supplyTaskHtyService;
}
-
-
+
+
+ /// <summary>
+ /// pda鏌ヨ鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent GetCabinOrders(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -82,14 +90,28 @@
}
return content;
}
+
+ /// <summary>
+ /// pda鏌ョ湅鍏ュ簱璇︽儏琛�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
public WebResponseContent GetCabinOrderDetail(int pageNo, string orderNo)
{
WebResponseContent content = new WebResponseContent();
Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Includes(x => x.Details).First(x => x.Order_no == orderNo);
- List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
+ List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Status == 2 && x.OrderDetailStatus != "宸插畬鎴�").ToList();
content.OK(data: cabinOrderDetails);
return content;
}
+
+
+ /// <summary>
+ /// Pad鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent FeedbackIn([FromBody] SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -101,9 +123,11 @@
var Inqty = saveModel.MainData["Inqty"].ObjToInt();
var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
- if (cabinOrder == null) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
- Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
- if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
+ if (cabinOrder == null || cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
+ Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Status == 2).First();
+ if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
cabinOrderDetail.Order_Inqty += Inqty;
@@ -119,14 +143,29 @@
if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
{
cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
- _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+ //_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+
+ //Dt_CabinOrderDetail_Hty hty = new Dt_CabinOrderDetail_Hty
+ //{
+ // Id = cabinOrderDetail.OrderId,
+ // Reservoirarea = cabinOrderDetail.Reservoirarea,
+ // Goods_no = cabinOrderDetail.Goods_no,
+ // Order_qty = cabinOrderDetail.Order_qty,
+ // Order_Inqty = cabinOrderDetail.Order_Inqty,
+ // Batch_num = cabinOrderDetail.Batch_num,
+ // Exp_date = cabinOrderDetail.Exp_date,
+ // OrderDetailStatus = cabinOrderDetail.OrderDetailStatus,
+ // Status = cabinOrderDetail.Status,
+ // Creater = cabinOrderDetail.Creater,
+ // CreateDate = cabinOrderDetail.CreateDate,
+ // Modifier = App.User.UserName,
+ // ModifyDate = DateTime.Now
+ //};
+ //var i = BaseDal.Db.Insertable(hty).ExecuteCommand();
}
- else
- {
- _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
- }
+ _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).First();
- if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OdrderStatus = "宸插畬鎴�";
+ if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "宸插畬鎴�").Any()) cabinOrder.OdrderStatus = "宸插畬鎴�";
Repository.UpdateData(cabinOrder);
#endregion
@@ -135,7 +174,7 @@
if (location == null) return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵LocationCode}銆戠殑璐т綅淇℃伅");
if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵LocationCode}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
- if (location.LocationStatus != LocationStatusEnum.InStock.ObjToInt())
+ if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
_basicService.LocationInfoService.UpdateData(location);
@@ -147,6 +186,7 @@
if (inventoryInfo != null)
{
inventoryInfo.StockQuantity += Inqty;
+ inventoryInfo.AvailableQuantity += Inqty;
_inventoryInfoService.UpdateData(inventoryInfo);
}
else
@@ -159,6 +199,7 @@
MaterielSpec = materielInfo.MaterielSpec,
OutboundQuantity = 0,
StockQuantity = Inqty,
+ AvailableQuantity = Inqty,
StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
ValidityPeriod = cabinOrderDetail.Exp_date,
WarehouseCode = cabinOrderDetail.Reservoirarea,
@@ -173,10 +214,33 @@
#endregion
#region 浠诲姟璁板綍
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ #region MyRegion
+ //Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ //{
+ // WarehouseCode = cabinOrderDetail.Reservoirarea,
+ // TaskNum = cabinOrderDetail.Id,
+ // TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ // BatchNo = inventoryInfo.BatchNo,
+ // MaterielName = inventoryInfo.MaterielName,
+ // MaterielCode = inventoryInfo.MaterielCode,
+ // MaterielSpec = inventoryInfo.MaterielSpec,
+ // TaskType = TaskTypeEnum.InPick.ObjToInt(),
+ // CreateDate = DateTime.Now,
+ // Creater = App.User.UserName,
+ // LocationCode = location.LocationCode,
+ // OrderNo = cabinOrder.Order_no,
+ // StockQuantity = Inqty,
+ // SupplyQuantity = 0,
+ // Remark = "鍏ュ簱"
+ //};
+ //_supplyTaskService.AddData(supplyTask);
+ #endregion
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
{
WarehouseCode = cabinOrderDetail.Reservoirarea,
TaskNum = cabinOrderDetail.Id,
+ OperateType = OperateTypeEnum.浜哄伐瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
BatchNo = inventoryInfo.BatchNo,
MaterielName = inventoryInfo.MaterielName,
@@ -191,7 +255,7 @@
SupplyQuantity = 0,
Remark = "鍏ュ簱"
};
- _supplyTaskService.AddData(supplyTask);
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
#endregion
#region 搴撳瓨鎵规
@@ -199,6 +263,7 @@
if (inventory_Batch != null)
{
inventory_Batch.StockQuantity += Inqty;
+ inventory_Batch.AvailableQuantity += Inqty;
_inventory_BatchServices.UpdateData(inventory_Batch);
}
else
@@ -216,6 +281,7 @@
ProductionDate = inventoryInfo.ProductionDate,
Status = false,
StockQuantity = inventoryInfo.StockQuantity,
+ AvailableQuantity = inventoryInfo.StockQuantity,
ValidityPeriod = inventoryInfo.ValidityPeriod,
SupplyQuantity = inventoryInfo.SupplyQuantity,
};
@@ -235,8 +301,7 @@
}
return content;
}
-
-
+ static string SearchDate = "2025-10-10 00:00:00";
/// <summary>
/// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
/// </summary>
@@ -249,14 +314,16 @@
{
// 璇锋眰鍦板潃
var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
- //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363009261";
+
+ if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//// 璇锋眰鍙傛暟
var requestData = new
{
- //searchDate = SearchDate
- searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
+ searchDate = SearchDate
+ //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
- //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
// 鍙戣捣璇锋眰
var result = HttpHelper.Post(url, requestData.ToJsonString());
@@ -298,153 +365,22 @@
foreach (var order in newOrders)
{
- bool skipOrder = false;//鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- var entityOrder = new Dt_CabinOrder
+ if (order.order_type == "1") //姝ｅ父鍏ュ簱
{
- Order_no = order.order_no,
- //鍏ュ簱鍗曠被鍨�
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = new List<Dt_CabinOrderDetail>()
- //Details = order.details.Select(d => new Dt_CabinOrderDetail
- //{
- // //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
- // // SqlSugar InsertNav宸ヤ綔鍘熺悊鍏堟彃鍏ヤ富琛� (Dt_CabinOrder)//鑾峰彇鐢熸垚鐨勪富閿甀D//鑷姩璁剧疆瀛愯〃鐨勫叧鑱斿瓧娈� (OrderId)//鍐嶆彃鍏�(Dt_CabinOrderDetail)
- // Goods_no = d.goods_no,
- // Order_qty = d.order_qty,
- // Batch_num = d.batch_num,
- // Exp_date = d.exp_date,
- // OrderDetailStatus = "鏂板缓",
- // Status = order.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
- //}).ToList()
- };
- foreach (var item in order.details)
- {
- // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
- item.order_qty = Math.Abs(item.order_qty);
- #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
- //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null)
- {
- skipOrder = true;
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
- break;
- }
-
- // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
- {
- skipOrder = true;
- break;
- }
- //Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
- ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱 //澶т欢鍏ュ钩搴�
- if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
- {
- Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = item.order_qty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- };
- entityOrder.Details.Add(orderDetail);
- }
- else
- {
- Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
- var xs = item.order_qty / materielInfo.BoxQty;//鏁寸鏁伴噺
- #region 鐢熸垚绔嬪簱鍏ュ簱鍗�
-
- #region 鍒ゆ柇鏄惁鏈夋暎浠�
- if (ys > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = ys,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += ys;
- }
- #endregion
-
- #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
- while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
- {
- xs--;
- if (orderDetail == null)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- else
- {
- orderDetail.Order_qty += materielInfo.BoxQty;
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- }
- #endregion
-
- if (orderDetail != null) entityOrder.Details.Add(orderDetail);
- #endregion
-
- #region 鍓╀綑鏁翠欢鍏ュ钩搴�
- if (xs > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty * xs,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- };
- entityOrder.Details.Add(orderDetail);
- }
- #endregion
- }
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
- //_medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
- #endregion
+ responseContent = CreateInboundOrder(order);
+ List<Dt_CabinOrder>? dt_CabinOrders = responseContent.Data as List<Dt_CabinOrder>;
+ if (dt_CabinOrders != null) _CabinOrders.AddRange(dt_CabinOrders);
}
- // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
- if (skipOrder)
+ else
{
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
- continue;
+ //鍒涘缓鍑哄簱鍗�
+
}
- _CabinOrders.Add(entityOrder);
- orderNos.Add(order.order_no);
};
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
+ //EdiIn(); //鍙戠粰涓嬫父
//濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
@@ -464,213 +400,176 @@
}
}
+
+ #region 鍒涘缓鍏ュ簱鍗�
/// <summary>
- /// 瀵规病鏈夎繘琛岀淮鎶ゅ晢鍝佷俊鎭〃鐨勫叆搴撳崟杩涜杩囨护澶勭悊
+ /// 鍒涘缓鍏ュ簱鍗�,杩斿洖涓�涓叆搴撳崟闆嗗悎鍒癲ata
/// </summary>
- /// <returns></returns>
- public WebResponseContent GetUpstreamOrder2()
+ public WebResponseContent CreateInboundOrder(UpstreamOrderInfo order)
{
- var responseContent = new WebResponseContent();
+ WebResponseContent webResponseContent = new WebResponseContent();
try
{
- // 璇锋眰鍦板潃
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
- //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- //// 璇锋眰鍙傛暟
- var requestData = new
+ List<Dt_CabinOrder> dt_CabinOrders = new List<Dt_CabinOrder>();
+ #region 鐗规畩鑽搧鍏ョ壒娈婂簱鎴�
+ if (order.warehouse_no == WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000") || order.warehouse_no == WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000"))
{
- //searchDate = SearchDate
- searchDate = "2020-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
- };
- //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
-
- if (response.resultCode != "0")
- {
- SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
-
- var existingOrderNos = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Select(x => x.Order_no)
- .ToList();
-
- var newOrders = response.data
- .Where(order => !existingOrderNos.Contains(order.order_no))
- .ToList();
-
- if (!newOrders.Any())
- return responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
-
- Db.Ado.BeginTran();
- try
- {
- List<Dt_CabinOrder> _CabinOrders = new();
- List<string> orderNos = new();
-
- foreach (var order in newOrders)
+ var entityOrder = new Dt_CabinOrder
{
- bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- var entityOrder = new Dt_CabinOrder
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
{
- Order_no = order.order_no,
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = new List<Dt_CabinOrderDetail>()
- };
-
- foreach (var item in order.details)
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
+ }).ToList()
+ };
+ dt_CabinOrders.Add(entityOrder);
+ webResponseContent.OK(data: dt_CabinOrders);
+ }
+ #endregion
+ else
+ {
+ var entityOrder = new Dt_CabinOrder//澶т欢搴撹鍗�
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ var entityOrderLK = new Dt_CabinOrder//绔嬪簱璁㈠崟
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ foreach (var item in order.details)
+ {
+ // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
+ item.order_qty = Math.Abs(item.order_qty);
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵item.goods_no}銆戠殑淇℃伅");
+ if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑灞炴�у垎绫�");
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
+ if (materielInfo.MinQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绔嬪簱鏈�浣庡簱瀛樻暟");
+ #endregion
+ #region 澶т欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
{
- item.order_qty = Math.Abs(item.order_qty);
-
- // 鏌ヨ鐗╂枡淇℃伅
- var materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>()
- .Where(x => x.Goods_no == item.goods_no)
- .First();
-
-
- //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null)
+ Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
{
- skipOrder = true;
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
- break;
- }
-
- // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
- if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = item.order_qty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = (int)(item.order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
+ #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ if (ys > 0)
{
- skipOrder = true;
- break;
- }
-
- // 鍖哄垎澶т欢/灏忎欢
- if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
- {
- var detail = new Dt_CabinOrderDetail
+ orderDetail = new Dt_CabinOrderDetail()
{
- Reservoirarea = order.warehouse_no,
+ Reservoirarea = entityOrderLK.Warehouse_no,
Goods_no = item.goods_no,
- Order_qty = item.order_qty,
+ Order_qty = ys,
Batch_num = item.batch_num,
Exp_date = item.exp_date,
OrderDetailStatus = "鏂板缓",
- Status = 2
+ Status = 0
};
- entityOrder.Details.Add(detail);
+ materielInfo.Business_qty += ys;
}
- else
- {
- Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty; // 涓嶈兘鏁撮櫎鐨勬暎浠�
- var xs = item.order_qty / materielInfo.BoxQty; // 鏁寸鏁伴噺
+ #endregion
- // 鏈夋暎浠�
- if (ys > 0)
+ #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
+ while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0) //褰撲笟鍔℃暟閲忓拰鏁寸鏁伴兘澶т簬0鐨勬椂鍊欐墠浼氬仠姝㈠惊鐜�
+ {
+ xs--;
+ if (orderDetail == null)
{
- orderDetail = new Dt_CabinOrderDetail
+ orderDetail = new Dt_CabinOrderDetail()
{
- Reservoirarea = order.warehouse_no,
+ Reservoirarea = entityOrderLK.Warehouse_no,
Goods_no = item.goods_no,
- Order_qty = ys,
+ Order_qty = materielInfo.BoxQty,
Batch_num = item.batch_num,
Exp_date = item.exp_date,
OrderDetailStatus = "鏂板缓",
Status = 0
};
- materielInfo.Business_qty += ys;
- }
-
- // 涓嶈冻鏈�浣庡簱瀛樻椂琛ュ叆绔嬪簱
- while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
- {
- xs--;
- if (orderDetail == null)
- {
- orderDetail = new Dt_CabinOrderDetail
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- }
- else
- {
- orderDetail.Order_qty += materielInfo.BoxQty;
- }
materielInfo.Business_qty += materielInfo.BoxQty;
}
-
- if (orderDetail != null) entityOrder.Details.Add(orderDetail);
-
- // 鍓╀綑鏁寸鍏ュ钩搴�
- if (xs > 0)
+ else
{
- entityOrder.Details.Add(new Dt_CabinOrderDetail
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty * xs,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- });
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ materielInfo.Business_qty += materielInfo.BoxQty;
}
}
- _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
+ if (orderDetail != null) entityOrderLK.Details.Add(orderDetail);
+ #endregion
+
+ #region 鍓╀綑鏁翠欢鍏ュ钩搴�
+ if (xs > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty * xs,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
}
-
- // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
- if (skipOrder)
- {
- Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
- continue;
- }
-
- _CabinOrders.Add(entityOrder);
- orderNos.Add(order.order_no);
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
}
-
- if (_CabinOrders.Any())
- {
- BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
- Db.Ado.CommitTran();
- return responseContent.OK($"鎴愬姛鍚屾 {_CabinOrders.Count} 鏉″叆搴撳崟");
- }
- else
- {
- Db.Ado.RollbackTran();
- return responseContent.OK("鏃犲彲澶勭悊鐨勫叆搴撳崟锛堝晢鍝佸睘鎬ф湭瀹氫箟鎴栨湭鎵惧埌锛�");
- }
- }
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
+ if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
+ webResponseContent.OK(data: dt_CabinOrders);
}
}
catch (Exception ex)
{
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ webResponseContent.Error(ex.Message);
}
+ return webResponseContent;
}
+ #endregion
/// <summary>
/// 浼犵粰wcs
@@ -693,8 +592,11 @@
// 3. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0锛�
foreach (var order in orders)
{
+ Console.WriteLine($"璁㈠崟 {order.Order_no} 鍘熸槑缁嗘暟锛歿order.Details.Count}");
order.Details = order.Details.Where(d => d.Status == 0).ToList();
+ Console.WriteLine($"璁㈠崟 {order.Order_no} 杩囨护鍚庢槑缁嗘暟锛歿order.Details.Count}");
}
+
if (orders == null || !orders.Any())
{
@@ -702,18 +604,13 @@
return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
}
-
// 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
foreach (var order in orders)
{
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
- {
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterielErpType;
- }
+ // 浠庣涓�涓湁 MedicineGoods 鐨勬槑缁嗕腑鍙栧嚭 MaterielErpType
+ string materialCode = order.Details
+ .Select(d => d.MedicineGoods?.MaterielErpType)
+ .FirstOrDefault(x => !string.IsNullOrEmpty(x)) ?? "YY"; // 榛樿鍊糦Y
var ediDto = new ToediInInfo
{
@@ -748,22 +645,11 @@
manufacturer = d.MedicineGoods?.Factory,
//鎴垮彿
libraryNo = order.Warehouse_no,
- //鐩樼泩鍏ュ簱
- //stocktakingDetails = new List<ToediInStock>()
- //stocktakingDetails = new List<ToediInStock>()
- //{
- // new ToediInStock
- // {
- // //鏂欑鍙�
- // palletCode = "PDA001",
- // //鏁伴噺
- // quantity = d.Order_qty.ToString()
- // }
- // }
}).ToList()
};
var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363019549";
var result = HttpHelper.Post(url, ediDto.ToJsonString());
var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
@@ -775,9 +661,9 @@
.Where(o => o.Id == order.Id)
.ExecuteCommand();
- // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
+ // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝� //杩欓噷瑕佹槸灏嗘柊寤�--銆嬪紑濮嬬姸鎬�,鍦ㄥ悗绔帴鍙ｈ繑鍥炴垜浠殑鏃跺�欏湪杩斿洖宸插畬鎴�
BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
- .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "宸插畬鎴�" })
+ .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "寮�濮�" })
.Where(d => d.OrderId == order.Id && d.Status == 0)
.ExecuteCommand();
@@ -811,113 +697,42 @@
var responseContent = new WebResponseContent();
try
{
- // 鏌ユ壘鎵�鏈夆�滃紑濮嬧�濈姸鎬佺殑鍏ュ簱鍗�
- var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Where(o => o.OdrderStatus == "寮�濮�")
- .ToList();
-
- if (orders == null || !orders.Any())
+ #region 鏌ユ壘鎵�鏈夊凡瀹屾垚鍏ュ簱鍗�
+ var inorders = BaseDal.QueryData(x => x.OdrderStatus == "宸插畬鎴�").Select(x => x.Order_no).ToList();
+ foreach (var inorder in inorders)
{
- return responseContent.OK("鏆傛棤闇�瑕佸鐞嗙殑鍏ュ簱鍗�");
- }
-
- int successCount = 0;
- int failCount = 0;
-
- foreach (var order in orders)
- {
- try
+ //var Orders = BaseDal.QueryData(x => x.Order_no == inorder);
+ var Orders = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == inorder).Includes(x => x.Details).ToList();
+ if (!Orders.Where(x => x.OdrderStatus != "宸插畬鎴�").Any())
{
BaseDal.Db.Ado.BeginTran();
-
- // 鏌ヨ璇ュ崟鐨勬槑缁�
- var details = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
- .Where(d => d.OrderId == order.Id)
- .ToList();
-
- // 鍒ゆ柇鏄惁鍏ㄩ儴瀹屾垚
- var totalCount = details.Count;
- var completedCount = details.Count(d => d.OrderDetailStatus == "宸插畬鎴�");
-
- if (totalCount > 0 && completedCount == totalCount)
+ BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
+ foreach (var item in Orders)
{
- // 鏇存柊琛ㄥご鐘舵��
- order.OdrderStatus = "宸插畬鎴�";
- BaseDal.Db.Updateable(order).ExecuteCommand();
-
- // 璋冪敤涓婃父鎺ュ彛
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
- var result = HttpHelper.Post(url, new { order_no = order.Order_no }.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
-
- if (response.resultCode == "0")
- {
- // === 姝ラ 1锛氭彃鍏ュ巻鍙茶〃 ===
-
- // 1.1 鎻掑叆琛ㄥご鍘嗗彶
- var orderHistory = new Dt_CabinOrder_Hty
- {
- Id = order.Id,
- Order_no = order.Order_no,
- Order_type = order.Order_type,
- Supplier_no = order.Supplier_no,
- Supplier_name = order.Supplier_name,
- Account_tiem = order.Account_tiem,
- Warehouse_no = order.Warehouse_no,
- OdrderStatus = order.OdrderStatus,
-
- };
- var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();
-
- // 1.2 鎻掑叆鏄庣粏鍘嗗彶
- var detailsHistory = details.Select(d => new Dt_CabinOrderDetail_Hty
- {
- Id = d.Id,
- Reservoirarea = d.Reservoirarea,
- Goods_no = d.Goods_no,
- Order_qty = d.Order_qty,
- Order_Inqty = d.Order_Inqty,
- Batch_num = d.Batch_num,
- Exp_date = d.Exp_date,
- OrderDetailStatus = d.OrderDetailStatus,
- Status = d.Status,
-
- }).ToList();
-
- BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
-
- // === 姝ラ 2锛氬垹闄ゅ師濮嬭〃 ===
- BaseDal.Db.Deleteable<Dt_CabinOrderDetail>().Where(d => d.OrderId == order.Id).ExecuteCommand();
- BaseDal.Db.Deleteable<Dt_CabinOrder>().Where(o => o.Id == order.Id).ExecuteCommand();
-
- // 鎻愪氦浜嬪姟
- BaseDal.Db.Ado.CommitTran();
- successCount++;
- }
- else
- {
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", order.Order_no);
- }
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
+ }
+ // 璋冪敤涓婃父鎺ュ彛
+ var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
+ var result = HttpHelper.Post(url, new { order_no = inorder }.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response.resultCode == "0")
+ {
+ // 鎻愪氦浜嬪姟
+ BaseDal.Db.Ado.CommitTran();
}
else
{
BaseDal.Db.Ado.RollbackTran();
+ SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", inorder);
}
}
- catch (Exception ex)
- {
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(1, "", ex.Message, order.Order_no);
- }
}
-
- return responseContent.OK($"鎵归噺澶勭悊瀹屾垚锛氭垚鍔� {successCount} 鍗曪紝澶辫触 {failCount} 鍗曘��");
+ #endregion
+ return responseContent.OK();
}
catch (Exception ex)
{
+ BaseDal.Db.Ado.RollbackTran();
return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
}
}
--
Gitblit v1.9.3