From c30ac3ad95328c1a34661ecde471e4215df9dab3 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 十月 2025 19:54:03 +0800
Subject: [PATCH] 添加盘点功能、添加立方智能库补货功能(入库平库调拨出库,立库调拨入库)
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 353 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 326 insertions(+), 27 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 d4560c4..415829a 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"
@@ -1,5 +1,6 @@
锘縰sing HslCommunication;
using MailKit.Search;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -7,12 +8,19 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
-
+using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
+using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
using static System.Net.WebRequestMethods;
@@ -24,11 +32,26 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
-
- static string SearchDate = "";
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal) : base(BaseDal)
+ static string SearchDate = "";
+ private readonly IBasicService _basicService;
+ private readonly IMedicineGoodsServices _medicineGoodsServices;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IInventory_BatchServices _inventory_BatchServices;
+ private readonly IInventoryInfoService _inventoryInfoService;
+ private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
+ private readonly ISupplyTaskService _supplyTaskService;
+ 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)
{
+ _basicService = basicService;
+ _medicineGoodsServices = medicineGoodsServices;
+ _unitOfWorkManage = unitOfWorkManage;
+ _inventory_BatchServices = inventory_BatchServices;
+ _inventoryInfoService = inventoryInfoService;
+ _cabinOrderDetailServices = cabinOrderDetailServices;
+ _supplyTaskService = supplyTaskService;
}
/// <summary>
@@ -129,7 +152,186 @@
// return responseContent.Error("鍚屾澶辫触: " + ex.Message);
// }
//}
+ public WebResponseContent GetCabinOrders(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ int pageNo = saveModel.MainData["pageNo"].ObjToInt();
+ string warehouseCode = saveModel.MainData["warehouseId"].ToString();
+ string orderNo = saveModel.MainData["orderNo"].ToString();
+ List<Dt_CabinOrder> dt_ReceiveOrders = new List<Dt_CabinOrder>();
+ if (string.IsNullOrEmpty(orderNo))
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.OdrderStatus == "鏂板缓" || x.OdrderStatus == "寮�濮�") && x.Warehouse_no == warehouseCode).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ }
+ else
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.Order_no.Contains(orderNo) || x.Supplier_no.Contains(orderNo)) && (x.OdrderStatus == "鏂板缓" || x.OdrderStatus == "寮�濮�") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
+ }
+ content.OK(data: dt_ReceiveOrders);
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+ return content;
+ }
+ 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();
+ content.OK(data: cabinOrderDetails);
+ return content;
+ }
+ public WebResponseContent FeedbackIn([FromBody] SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var LocationCode = saveModel.MainData["LocationCode"].ToString();
+ var orderNo = saveModel.MainData["orderNo"].ToString();
+ var batchNo = saveModel.MainData["batchNo"].ToString();
+ 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($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
+ 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;
+ if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
+ return WebResponseContent.Instance.Error($"鍏ュ簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+
+ #region 澶勭悊鍏ュ簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
+ _unitOfWorkManage.BeginTran();
+
+ #region 鍏ュ簱鍗�
+ cabinOrder.OdrderStatus = "寮�濮�";
+ cabinOrderDetail.OrderDetailStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
+ {
+ cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+ }
+ else
+ {
+ _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 = "宸插畬鎴�";
+ Repository.UpdateData(cabinOrder);
+ #endregion
+
+ #region 璐т綅
+ var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ 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())
+ {
+ location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.LocationInfoService.UpdateData(location);
+ }
+ #endregion
+
+ #region 搴撳瓨
+ Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
+ if (inventoryInfo != null)
+ {
+ inventoryInfo.StockQuantity += Inqty;
+ _inventoryInfoService.UpdateData(inventoryInfo);
+ }
+ else
+ {
+ inventoryInfo = new Dt_InventoryInfo()
+ {
+ LocationCode = LocationCode,
+ MaterielCode = materielInfo.MaterielCode,
+ MaterielName = materielInfo.MaterielName,
+ MaterielSpec = materielInfo.MaterielSpec,
+ OutboundQuantity = 0,
+ StockQuantity = Inqty,
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ ValidityPeriod = cabinOrderDetail.Exp_date,
+ WarehouseCode = cabinOrderDetail.Reservoirarea,
+ SupplyQuantity = 0,
+ InDate = DateTime.Now,
+ BatchNo = cabinOrderDetail.Batch_num,
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ };
+ _inventoryInfoService.AddData(inventoryInfo);
+ }
+ #endregion
+
+ #region 浠诲姟璁板綍
+ 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
+
+ #region 搴撳瓨鎵规
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
+ if (inventory_Batch != null)
+ {
+ inventory_Batch.StockQuantity += Inqty;
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ else
+ {
+ inventory_Batch = new Dt_Inventory_Batch()
+ {
+ BatchNo = inventoryInfo.BatchNo,
+ CreateDate = inventoryInfo.CreateDate,
+ Creater = inventoryInfo.Creater,
+ MaterielCode = inventoryInfo.MaterielCode,
+ ERPStockQuantity = 0,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ OutboundQuantity = inventoryInfo.OutboundQuantity,
+ ProductionDate = inventoryInfo.ProductionDate,
+ Status = false,
+ StockQuantity = inventoryInfo.StockQuantity,
+ ValidityPeriod = inventoryInfo.ValidityPeriod,
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ };
+ _inventory_BatchServices.AddData(inventory_Batch);
+ }
+ #endregion
+
+ _unitOfWorkManage.CommitTran();
+ #endregion
+
+ content.OK(cabinOrderDetail.Order_Inqty.ToString());
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
public WebResponseContent GetUpstreamOrder()
{
@@ -195,28 +397,125 @@
Supplier_no = order.supplier_no,
Account_tiem = order.account_time,
OdrderStatus = "鏂板缓",
- Supplier_name=order.supplier_name,
+ Supplier_name = order.supplier_name,
Warehouse_no = order.warehouse_no,
- 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()
+ 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);
+ 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
+ }
_CabinOrders.Add(entityOrder);
orderNos.Add(order.order_no);
};
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
- //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
+ //var reslut= EdiIn(); //鍙戠粰涓嬫父
+ //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
}
@@ -264,7 +563,7 @@
Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
}
-
+
// 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
foreach (var order in orders)
@@ -333,10 +632,10 @@
if (resp != null && resp.code == "0")
{
// 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_CabinOrder>()
- .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
+ BaseDal.Db.Updateable<Dt_CabinOrder>()
+ .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
+ .Where(o => o.Id == order.Id)
+ .ExecuteCommand();
// 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
@@ -357,7 +656,7 @@
}
catch (Exception ex)
{
-
+
Console.WriteLine("EdiIn 寮傚父锛�" + ex.Message);
return new WebResponseContent { Status = false, Message = ex.Message };
}
@@ -444,7 +743,7 @@
Exp_date = d.Exp_date,
OrderDetailStatus = d.OrderDetailStatus,
Status = d.Status,
-
+
}).ToList();
BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
@@ -486,7 +785,7 @@
}
-
+
/// <summary>
@@ -518,7 +817,7 @@
-
+
}
--
Gitblit v1.9.3