From 1c8f0035e164e9780d8c35a32fc1524d67ff9d9d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 01 十一月 2025 17:24:25 +0800
Subject: [PATCH] 优化PDA入库
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 183 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 148 insertions(+), 35 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 dd4a2a8..bfefa82 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"
@@ -33,9 +33,8 @@
namespace WIDESEA_SquareCabinServices
{
- public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
+ public partial 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>
@@ -123,16 +125,18 @@
var LocationCode = saveModel.MainData["LocationCode"].ToString();
var orderNo = saveModel.MainData["orderNo"].ToString();
var batchNo = saveModel.MainData["batchNo"].ToString();
+ var id = saveModel.MainData["id"].ObjToInt();
var materielCode = saveModel.MainData["materielCode"].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 || cabinOrder.OdrderStatus == "宸插畬鎴�")
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
- Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();
+ //Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();
+ Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Id == id).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 +159,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 +168,7 @@
if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ _locationInfoService.UpdateData(location);
}
#endregion
@@ -197,6 +201,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
@@ -270,7 +289,7 @@
Status = false,
StockQuantity = inventoryInfo.StockQuantity,
AvailableQuantity = inventoryInfo.StockQuantity,
- ValidityPeriod = inventoryInfo.ValidityPeriod,
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
SupplyQuantity = inventoryInfo.SupplyQuantity,
};
_inventory_BatchServices.AddData(inventory_Batch);
@@ -316,6 +335,7 @@
Warehouse_no = order.warehouse_no,
Details = order.details.Select(d => new Dt_CabinOrderDetail
{
+ Reservoirarea = order.warehouse_no,
Goods_no = d.goods_no,
Order_qty = Math.Abs(d.order_qty),
Batch_num = d.batch_num,
@@ -325,11 +345,13 @@
}).ToList()
};
dt_CabinOrders.Add(entityOrder);
- webResponseContent.OK(data: dt_CabinOrders);
+ BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
+ //webResponseContent.OK(data: dt_CabinOrders);
}
#endregion
else
{
+ #region 鍒涘缓鍏ュ簱鍗曞ご琛ㄣ�佸ぇ浠跺簱鍜岀珛搴�
var entityOrder = new Dt_CabinOrder//澶т欢搴撹鍗�
{
Order_no = order.order_no,
@@ -352,17 +374,19 @@
Warehouse_no = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"),
Details = new List<Dt_CabinOrderDetail>()
};
+ #endregion
+
+ List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => order.details.Select(x => x.goods_no).Contains(x.MaterielCode));
+ List<Dt_MaterielInfo> materielInfosUp = new List<Dt_MaterielInfo>();
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_MaterielInfo? materielInfo = materielInfos.Where(x => x.MaterielCode == item.goods_no).FirstOrDefault();
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)//濡傛灉鐗╂枡鏄ぇ浠�
@@ -382,6 +406,8 @@
#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; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
var xs = (int)(item.order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
@@ -446,16 +472,22 @@
entityOrder.Details.Add(orderDetail);
}
#endregion
+ materielInfosUp.Add(materielInfo);
}
- _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ //_materielInfoService.UpdateData(materielInfo);
}
+ _unitOfWorkManage.BeginTran();
+ if (materielInfosUp.Count > 0) _materielInfoService.UpdateData(materielInfosUp);
if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
- webResponseContent.OK(data: dt_CabinOrders);
+ if (dt_CabinOrders.Count > 0) BaseDal.Db.InsertNav(dt_CabinOrders).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ //webResponseContent.OK(data: dt_CabinOrders);
}
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
webResponseContent.Error(ex.Message);
}
return webResponseContent;
@@ -470,18 +502,25 @@
{
string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ List<Dt_SupplyTask_Hty> supplyTask_Hties = new List<Dt_SupplyTask_Hty>();
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> infosUp = new List<Dt_InventoryInfo>();
+ var codes = order.details.Select(x => x.goods_no).ToList();
#region 鐗规畩搴撴埧
if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)
{
+
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
#region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
foreach (var item in order.details)
{
//鎵惧簱瀛樻壒娆′俊鎭�
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
//鎵炬墍鏈夊簱瀛�
- List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
foreach (var inventoryInfo in inventoryInfos)
{
#region 娣诲姞鐩樼泩鍏ュ簱浠诲姟
@@ -506,17 +545,20 @@
SupplyQuantity = 0,
Remark = "鐩樼泩鍏ュ簱"
};
- _supplyTaskHtyService.AddData(supplyTask_Hty);
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
}
#endregion
inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
inventoryInfo.SupplyQuantity = 0;
inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
}
+ infosUp.AddRange(inventoryInfos);
inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
inventory_Batch.SupplyQuantity = 0;
- _inventoryInfoService.UpdateData(inventoryInfos);
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ batchesUp.Add(inventory_Batch);
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ //_inventory_BatchServices.UpdateData(inventory_Batch);
}
#endregion
@@ -542,24 +584,31 @@
Status = 2,
}).ToList()
};
- Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
//Repository.AddData(entityOrder);
#endregion
}
#endregion
else
{
+ List<Dt_CabinOrder> cabinOrdersAdd = new List<Dt_CabinOrder>();
string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
-
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
foreach (var item in order.details)
{
//鎵惧簱瀛樻壒娆′俊鎭�
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
//鎵炬墍鏈夊簱瀛�
- List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
//鑾峰彇绔嬪簱鐩樼偣宸紓鏁�
var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
@@ -594,17 +643,20 @@
SupplyQuantity = 0,
Remark = "鐩樼泩鍏ュ簱"
};
- _supplyTaskHtyService.AddData(supplyTask_Hty);
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
}
#endregion
inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
inventoryInfo.SupplyQuantity = 0;
inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
}
- _inventoryInfoService.UpdateData(inventoryInfos);
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ infosUp.AddRange(inventoryInfos);
inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
inventory_Batch.SupplyQuantity = 0;
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ //_inventory_BatchServices.UpdateData(inventory_Batch);
+ batchesUp.Add(inventory_Batch);
#endregion
#region 鍒涘缓澶т欢搴撶洏鐐瑰崟
@@ -630,8 +682,8 @@
}).ToList()
};
//Repository.AddData(entityOrder);
- Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
-
+ //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ cabinOrdersAdd.Add(entityOrder);
#endregion
}
else
@@ -662,14 +714,16 @@
SupplyQuantity = 0,
Remark = "鐩樼泩鍏ュ簱"
};
- _supplyTaskHtyService.AddData(supplyTask_Hty);
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
}
#endregion
inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
inventoryInfo.SupplyQuantity = 0;
inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
}
- _inventoryInfoService.UpdateData(inventoryInfos);
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ infosUp.AddRange(inventoryInfos);
#endregion
#region 鍒涘缓澶т欢搴撶洏鐐瑰崟
@@ -697,8 +751,8 @@
}).ToList()
};
//Repository.AddData(cabinOrder);
- Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
-
+ //Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
+ cabinOrdersAdd.Add(cabinOrder);
}
#endregion
@@ -724,19 +778,78 @@
}).ToList()
};
//Repository.AddData(entityOrder);
- Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ cabinOrdersAdd.Add(entityOrder);
#endregion
}
}
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(cabinOrdersAdd).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
}
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
//_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, "鍒涘缓鐩樼泩鍏ュ簱鍗�", ex.Message);
content.Error(ex.Message);
}
return content;
}
#endregion
+
+
+ /// <summary>
+ /// 浜哄伐鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ public WebResponseContent FinishInOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ 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();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+
+ List<Dt_CabinOrderDetail> cabinOrderDetails = new List<Dt_CabinOrderDetail>();
+ foreach (var item in cabinOrders)
+ {
+ if (item.Details != null) cabinOrderDetails.AddRange(cabinOrderDetails);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ if (cabinOrder.Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
+ {
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ 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);
+
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
}
--
Gitblit v1.9.3