From a770206c91e495b802b3e9371e06834586ad7715 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 30 十月 2025 20:17:30 +0800
Subject: [PATCH] 1
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 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 0566d66..50d8b4e 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"
@@ -35,7 +35,6 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
- private readonly IBasicService _basicService;
private readonly IMedicineGoodsServices _medicineGoodsServices;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IInventory_BatchServices _inventory_BatchServices;
@@ -43,12 +42,13 @@
private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
private readonly ISupplyTaskHtyService _supplyTaskHtyService;
+ private readonly ILocationInfoService _locationInfoService;
+ private readonly IMaterielInfoService _materielInfoService;
private readonly IMessageInfoService _messageInfoService;
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, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
{
- _basicService = basicService;
_medicineGoodsServices = medicineGoodsServices;
_unitOfWorkManage = unitOfWorkManage;
_inventory_BatchServices = inventory_BatchServices;
@@ -57,12 +57,14 @@
_supplyTaskService = supplyTaskService;
_supplyTaskHtyService = supplyTaskHtyService;
_messageInfoService = messageInfoService;
+ _materielInfoService = materielInfoService;
+ _locationInfoService = locationInfoService;
}
/// <summary>
- /// pda鏌ヨ鍑哄簱鍗曚俊鎭�
+ /// pda鏌ヨ鍏ュ簱鍗曚俊鎭�
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
@@ -132,7 +134,7 @@
Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();
if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
+ Dt_MaterielInfo materielInfo = _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)
@@ -155,7 +157,7 @@
#endregion
#region 璐т綅
- var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ var location = _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}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
@@ -164,7 +166,7 @@
if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ _locationInfoService.UpdateData(location);
}
#endregion
@@ -197,6 +199,21 @@
Creater = App.User.UserName,
CreateDate = DateTime.Now,
};
+ switch (inventoryInfo.WarehouseCode)
+ {
+ case "001":
+ inventoryInfo.Remark = "鏅鸿兘绔嬪簱";
+ break;
+ case "002":
+ inventoryInfo.Remark = "澶т欢搴�";
+ break;
+ case "003":
+ inventoryInfo.Remark = "楹荤簿搴�";
+ break;
+ case "010":
+ inventoryInfo.Remark = "鍐峰喕搴�";
+ break;
+ }
_inventoryInfoService.AddData(inventoryInfo);
}
#endregion
@@ -316,7 +333,7 @@
Warehouse_no = order.warehouse_no,
Details = order.details.Select(d => new Dt_CabinOrderDetail
{
- Reservoirarea=order.warehouse_no,
+ Reservoirarea = order.warehouse_no,
Goods_no = d.goods_no,
Order_qty = Math.Abs(d.order_qty),
Batch_num = d.batch_num,
@@ -358,11 +375,10 @@
// 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
item.order_qty = Math.Abs(item.order_qty);
#region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ Dt_MaterielInfo materielInfo = _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}銆戠殑绠辫鏁伴噺");
#endregion
#region 澶т欢
if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -382,6 +398,7 @@
#endregion
else
{
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
if (materielInfo.MinQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绔嬪簱鏈�浣庡簱瀛樻暟");
Dt_CabinOrderDetail orderDetail = null;
var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
@@ -448,7 +465,7 @@
}
#endregion
}
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ _materielInfoService.UpdateData(materielInfo);
}
if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
@@ -740,6 +757,12 @@
}
#endregion
+
+ /// <summary>
+ /// 浜哄伐鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
public WebResponseContent FinishInOrder(int key)
{
WebResponseContent content = new WebResponseContent();
@@ -748,6 +771,7 @@
Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
_unitOfWorkManage.BeginTran();
+
foreach (var item in cabinOrders)
{
if (item.Details != null)
@@ -757,16 +781,22 @@
item.Details = null;
}
BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
- var requestDate = new
+
+ if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
+ _unitOfWorkManage.CommitTran();
+ else
{
- order_no = cabinOrder.Order_no
- };
- var result = HttpHelper.Post(url, requestDate.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
- if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
- if (response.resultCode != "0") throw new Exception(response.resultMsg);
- _unitOfWorkManage.CommitTran();
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = cabinOrder.Order_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
+ }
content.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3