From 34922eb239109534679d35a75661d6e2a5603347 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期六, 27 十二月 2025 10:16:36 +0800
Subject: [PATCH] 成品库流程
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 490 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 400 insertions(+), 90 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 52c6eee..06ad9c5 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -57,9 +57,10 @@
private IPalletTypeInfoRepository _palletTypeInfoRepository;
private readonly IReturnOrderRepository _returnOrderRepository;
+
public IInboundOrderRepository Repository => BaseDal;
- public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IWarehouseService warehouseService, IStockRepository stockRepository, IPalletTypeInfoRepository palletTypeInfoRepository,IReturnOrderRepository returnOrderRepository) : base(BaseDal)
+ public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IBasicRepository basicRepository, IInboundRepository inboundRepository, IUnitOfWorkManage unitOfWorkManage, ITaskRepository taskRepository, IStockService stockService, IInboundOrderDetailService inboundOrderDetailService, IInboundOrder_HtyService inboundOrderHtyService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IWarehouseService warehouseService, IStockRepository stockRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -78,7 +79,7 @@
}
/// <summary>
- /// 缁勭洏
+ /// PDA鎵爜缁勭洏
/// </summary>
/// <param name="materielGroupDTO"></param>
/// <returns></returns>
@@ -169,11 +170,11 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
///鎵炬暟閲忓尮閰嶇殑
- List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "")&& x.OrderQuantity >x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
{
- return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭垨鏁伴噺涓嶅尮閰�");
+ return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭垨鏁伴噺涓嶅尮閰�");
}
var inboundOrderDet = inboundOrderDetails.FirstOrDefault();
@@ -205,7 +206,7 @@
{
//if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
//{
- return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
+ return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
//}
//beforeQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
}
@@ -243,7 +244,7 @@
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
foreach (var model in models)
{
- Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch== model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
if (notGroupDetail == null)
{
@@ -319,6 +320,202 @@
}
return content;
}
+
+ /// <summary>
+ /// 鎴愬搧缁勭洏
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ public WebResponseContent CPMaterielGroup(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var orderNo = saveModel.MainData["orderNo"].ToString();
+ var palletCode = saveModel.MainData["palletCode"].ToString();
+ var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
+ var Initiallife = saveModel.MainData["initiallife"].ObjToInt();
+ // 棣栧厛楠岃瘉杈撳叆鏁版嵁
+ var serialNumbers = new List<string>();
+ var quantities = new List<decimal>();
+
+ foreach (var item in saveModel.DelKeys)
+ {
+ // 鐩存帴浣跨敤鍔ㄦ�佺被鍨嬭闂睘鎬э紝閬垮厤澶氫綑鐨勫簭鍒楀寲/鍙嶅簭鍒楀寲
+ var delKeyDict = item as IDictionary<string, object>;
+ if (delKeyDict == null)
+ {
+ string json = JsonConvert.SerializeObject(item);
+ delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+ }
+
+ // 澶勭悊搴忓垪鍙�
+ if (!delKeyDict.TryGetValue("serialNumber", out object serialNumberObj) || serialNumberObj == null)
+ {
+ return WebResponseContent.Instance.Error("缂哄皯serialNumber瀛楁鎴栧�间负绌�");
+ }
+
+ string serialNumber = serialNumberObj.ToString();
+ if (string.IsNullOrWhiteSpace(serialNumber))
+ {
+ return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
+ }
+ serialNumbers.Add(serialNumber);
+
+ // 澶勭悊鏁伴噺
+ if (!delKeyDict.TryGetValue("quantity", out object quantityObj) || quantityObj == null)
+ {
+ return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁鎴栧�间负绌�");
+ }
+
+ if (!decimal.TryParse(quantityObj.ToString(), out decimal quantity))
+ {
+ return WebResponseContent.Instance.Error($"鐗╂枡鏁伴噺'{quantityObj}'鏃犳硶杞崲涓烘暟瀛�");
+ }
+
+ if (quantity <= 0)
+ {
+ return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
+ }
+ quantities.Add(quantity);
+ }
+
+ // 楠岃瘉鏁伴噺涓庡簭鍒楀彿鏁伴噺涓�鑷�
+ if (serialNumbers.Count != quantities.Count)
+ {
+ return WebResponseContent.Instance.Error("搴忓垪鍙锋暟閲忎笌鐗╂枡鏁伴噺涓嶅尮閰�");
+ }
+
+ // 鑾峰彇浠撳簱淇℃伅
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ // 鑾峰彇鍏ュ簱鍗曚俊鎭�
+ Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>()
+ .Where(x => x.OrderNo == orderNo && x.WarehouseId == warehouse.WarehouseId)
+ .Includes(x => x.Details)
+ .First();
+
+ if (inboundOrder == null || inboundOrder.Details == null || inboundOrder.Details.Count <= 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ }
+
+ // 鎵归噺鏌ヨ鎵�鏈夌浉鍏崇鍙�/鎵樼洏鍙风殑CP鍏ュ簱鍗曟槑缁�
+ // 鏍规嵁鎮ㄧ殑涓氬姟閫昏緫锛岃繖閲屽簲璇ユ槸鏌ヨ BoxCode 鎴栬�� PalletCode 鍦� serialNumbers 涓殑璁板綍
+ // 鎴戝亣璁炬偍闇�瑕佹煡璇� BoxCode 鍦� serialNumbers 鍒楄〃涓殑鎵�鏈夎褰�
+ List<Dt_CPInboundOrderDetail> CPinboundOrderDetails = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>()
+ .LeftJoin<Dt_InboundOrderDetail>((cp, d) => cp.OrderDetailId == d.Id)
+ .LeftJoin<Dt_InboundOrder>((cp, d, o) => d.OrderId == o.Id)
+ .Where((cp, d, o) =>
+ o.OrderNo == orderNo &&
+ o.WarehouseId == warehouse.WarehouseId &&
+ serialNumbers.Contains(cp.BoxCode) // 淇敼杩欓噷锛氭壒閲忔煡璇�
+ )
+ .Select((cp, d, o) => cp)
+ .ToList();
+
+
+ // 鏂瑰紡2锛氬鏋滄偍闇�瑕佸垎鍒鐞嗙鍙峰拰鎵樼洏鍙凤紝鍙互鍒嗗紑鏌ヨ
+ var boxDetails = CPinboundOrderDetails.Where(x => serialNumbers.Contains(x.BoxCode)).ToList();
+
+ // 楠岃瘉鏌ヨ鍒扮殑鏁版嵁鏁伴噺鏄惁鍖归厤
+ if (CPinboundOrderDetails.Count < serialNumbers.Count)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墍鏈夊搴旂殑绠卞彿/鎵樼洏鍙蜂俊鎭紝鎵惧埌{CPinboundOrderDetails.Count}鏉★紝鏈熸湜{serialNumbers.Count}鏉�");
+ }
+
+ // 妫�鏌ユ墭鐩樻槸鍚﹀凡瀛樺湪
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db
+ .Queryable<Dt_StockInfo>()
+ .Where(x => x.PalletCode == palletCode)
+ .Includes(x => x.Details)
+ .First();
+
+ if (stockInfo == null)
+ {
+ // 鍒涘缓鏂版墭鐩�
+ stockInfo = new Dt_StockInfo()
+ {
+ //BatchNo = models.FirstOrDefault()?.LotNo ?? "",
+ PalletCode = palletCode,
+ PalletType = GetPalletType(warehouse, palletCode),
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
+ Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
+ Mgeneratetime = DateTime.Now,
+ WarehouseId = warehouse.WarehouseId,
+ Details = new List<Dt_StockInfoDetail>()
+ };
+ }
+ else
+ {
+ // 濡傛灉鎵樼洏宸插瓨鍦紝妫�鏌ユ槸鍚﹀凡缁忔槸缁勭洏鏆傚瓨鐘舵��
+ if (stockInfo.StockStatus != (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ {
+ return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
+ }
+ }
+
+ // 楠岃瘉鍜屾洿鏂版瘡涓墿鏂欑殑缁勭洏鏁伴噺
+ List<Dt_InboundOrderDetail> detailsToUpdate = new List<Dt_InboundOrderDetail>();
+
+
+
+ // 鏇存柊璁㈠崟鐘舵��
+ inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+
+ // 浜嬪姟澶勭悊
+ _unitOfWorkManage.BeginTran();
+ try
+ {
+ if (stockInfo.Id == 0)
+ {
+ _stockRepository.StockInfoRepository.Db.InsertNav(stockInfo)
+ .Include(x => x.Details)
+ .ExecuteCommand();
+ }
+ else
+ {
+ _stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo)
+ .Include(x => x.Details, new UpdateNavOptions()
+ {
+ OneToManyInsertOrUpdate = true
+ })
+ .ExecuteCommand();
+ }
+
+ // 鏇存柊璁㈠崟鏄庣粏
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(detailsToUpdate);
+
+ // 鏇存柊璁㈠崟
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
+
+ _unitOfWorkManage.CommitTran();
+
+
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error($"缁勭洏澶辫触锛歿ex.Message}");
+ }
+
+ return content;
+ }
+
public int GetPalletType(Dt_Warehouse warehouse, string palletCode)
{
@@ -430,31 +627,163 @@
{
return content.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
- if (item.SupplierBatch == null)
+ if (warehouse.WarehouseCode.Contains("CP"))
{
- return content.Error("渚涘簲鍟嗘壒娆′笉鍙负绌�");
- }
- Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.AsnNo).Includes(x => x.Details).First();
-
- if (inboundOrderOld != null)
- {
- if (inboundOrderOld.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ if (item.SupplierBatch == null)
{
- inboundOrderOld.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrderOld);
+ return content.Error("渚涘簲鍟嗘壒娆′笉鍙负绌�");
}
- Dt_InboundOrderDetail orderDetail1 = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inboundOrderOld.Id).First();
- Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.LinId == item.LinId && x.MaterielCode == item.MaterielCode);
- if (inboundOrderDetailOld != null)
+ Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.AsnNo).Includes(x => x.Details).First();
+
+ if (inboundOrderOld != null)
{
- inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
+ if (inboundOrderOld.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ inboundOrderOld.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrderOld);
+ }
+ Dt_InboundOrderDetail orderDetail1 = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inboundOrderOld.Id).First();
+ Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.LinId == item.LinId && x.MaterielCode == item.MaterielCode);
+ if (inboundOrderDetailOld != null)
+ {
+ inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
+ }
+ else
+ {
+ Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
+ {
+ OrderId = orderDetail1.OrderId,
+ MaterielCode = item.MaterielCode,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
+ ReceiptQuantity = 0,
+ OverInQuantity = 0,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ LinId = item.LinId,
+ LPNNo = item.LPN_No,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch
+ };
+ _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
+ }
+ }
+ else
+ {
+ foreach (var list in item.BoxList)
+ {
+ Dt_CPInboundOrderDetail cPInboundOrderDetail = new Dt_CPInboundOrderDetail()
+ {
+ BoxId = list.BoxId,
+ BoxCode = list.BoxCode,
+ DateCode = list.DateCode,
+ JobId = list.JobId,
+ PartNum = list.PartNum,
+ QtyOfpcs = list.QtyOfpcs,
+ QtyOfxout = list.QtyOfxout,
+ Creater = "涓婃父WMS",
+ };
+
+ Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
+ {
+ MaterielCode = item.MaterielCode,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
+ ReceiptQuantity = 0,
+ OverInQuantity = 0,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ LinId = item.LinId,
+ LPNNo = item.LPN_No,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch,
+ CPDetails = new List<Dt_CPInboundOrderDetail> { cPInboundOrderDetail }
+ };
+
+ Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
+ {
+ OrderNo = model.AsnNo,
+ UpperOrderNo = model.AsnNo,
+ WarehouseId = warehouse.WarehouseId,
+ //SupplierId = "",
+ OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt(),
+ CreateType = CreateType.UpperSystemPush.ObjToInt(),
+ Remark = "",
+ TransactionCode = model.TransactionCode,
+ InoutType = model.OrderType,
+ OrderType = model.InoutType.ObjToInt(),
+ Creater = "涓婃父WMS",
+ System = model.System,
+ Details = new List<Dt_InboundOrderDetail> { orderDetail }
+ };
+ //switch (model.OrderType)//鍗曟嵁绫诲瀷
+ //{
+ // case 1:
+ // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ // break;
+ // case 3:
+ // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
+ // break;
+ // case 6:
+ // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
+ // break;
+ // default:
+ // break;
+ //};
+ Db.InsertNav(inboundOrder).Include(x => x.Details).ThenInclude(x => x.CPDetails).ExecuteCommand();
+ }
+ }
+ }
+ else
+ {
+ if (item.SupplierBatch == null)
+ {
+ return content.Error("渚涘簲鍟嗘壒娆′笉鍙负绌�");
+ }
+ Dt_InboundOrder inboundOrderOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == model.AsnNo).Includes(x => x.Details).First();
+
+ if (inboundOrderOld != null)
+ {
+ if (inboundOrderOld.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ inboundOrderOld.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+ _inboundRepository.InboundOrderRepository.UpdateData(inboundOrderOld);
+ }
+ Dt_InboundOrderDetail orderDetail1 = BaseDal.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.OrderId == inboundOrderOld.Id).First();
+ Dt_InboundOrderDetail? inboundOrderDetailOld = inboundOrderOld.Details?.FirstOrDefault(x => x.LinId == item.LinId && x.MaterielCode == item.MaterielCode);
+ if (inboundOrderDetailOld != null)
+ {
+ inboundOrderDetailOld.OrderQuantity += item.OrderQuantity;
+ _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetailOld);
+ }
+ else
+ {
+ Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
+ {
+ OrderId = orderDetail1.OrderId,
+ MaterielCode = item.MaterielCode,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
+ ReceiptQuantity = 0,
+ OverInQuantity = 0,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ LinId = item.LinId,
+ LPNNo = item.LPN_No,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch
+ };
+ _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
+ }
}
else
{
Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
{
- OrderId = orderDetail1.OrderId,
MaterielCode = item.MaterielCode,
BatchNo = item.BatchNo,
OrderQuantity = item.OrderQuantity,
@@ -468,59 +797,40 @@
Creater = "涓婃父WMS",
SupplierBatch = item.SupplierBatch
};
- _inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
- }
- }
- else
- {
- Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
- {
- MaterielCode = item.MaterielCode,
- BatchNo = item.BatchNo,
- OrderQuantity = item.OrderQuantity,
- ReceiptQuantity = 0,
- OverInQuantity = 0,
- OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
- LinId = item.LinId,
- LPNNo = item.LPN_No,
- MaterielName = item.MaterielName,
- MaterieSpec = item.MaterieSpec,
- Creater = "涓婃父WMS",
- SupplierBatch = item.SupplierBatch
- };
- Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
- {
- OrderNo = model.AsnNo,
- UpperOrderNo = model.AsnNo,
- WarehouseId = warehouse.WarehouseId,
- //SupplierId = "",
- OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt(),
- CreateType = CreateType.UpperSystemPush.ObjToInt(),
- Remark = "",
- TransactionCode = model.TransactionCode,
- InoutType = model.OrderType,
- OrderType = model.InoutType.ObjToInt(),
- Creater = "涓婃父WMS",
- System = model.System,
- Details = new List<Dt_InboundOrderDetail> { orderDetail }
- };
- //switch (model.OrderType)//鍗曟嵁绫诲瀷
- //{
- // case 1:
- // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
- // break;
- // case 3:
- // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
- // break;
- // case 6:
- // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
- // break;
- // default:
- // break;
- //};
- Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
-
+ Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
+ {
+ OrderNo = model.AsnNo,
+ UpperOrderNo = model.AsnNo,
+ WarehouseId = warehouse.WarehouseId,
+ //SupplierId = "",
+ OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt(),
+ CreateType = CreateType.UpperSystemPush.ObjToInt(),
+ Remark = "",
+ TransactionCode = model.TransactionCode,
+ InoutType = model.OrderType,
+ OrderType = model.InoutType.ObjToInt(),
+ Creater = "涓婃父WMS",
+ System = model.System,
+ Details = new List<Dt_InboundOrderDetail> { orderDetail }
+ };
+ //switch (model.OrderType)//鍗曟嵁绫诲瀷
+ //{
+ // case 1:
+ // inboundOrder.OrderType = InOrderTypeEnum.Allocat.ObjToInt();
+ // break;
+ // case 3:
+ // inboundOrder.OrderType = InOrderTypeEnum.CustomerRecovery.ObjToInt();
+ // break;
+ // case 6:
+ // inboundOrder.OrderType = InOrderTypeEnum.SaleReturn.ObjToInt();
+ // break;
+ // default:
+ // break;
+ //};
+ Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+
+ }
}
}
_unitOfWorkManage.CommitTran();
@@ -549,7 +859,7 @@
{
_unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error(ex.Message);
-
+
}
finally
{
@@ -720,7 +1030,7 @@
MaterielName = model.MaterielName,
SupplierBatch = model.SupplierBatch,
OrderQuantity = model.OrderQuantity,
- BatchNo ="PC"+$"{datePart}{randomNum}",
+ BatchNo = "PC" + $"{datePart}{randomNum}",
OrderDetailStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
Creater = "WMS",
CreateDate = DateTime.Now,
@@ -811,7 +1121,7 @@
.Where(d => d.OrderId == inboundOrder.Id)
.Count();
//妫�鏌ユ槑缁嗗畬鎴愮殑涓暟
- int overCount = _inboundRepository.InboundOrderDetailRepository
+ int overCount = _inboundRepository.InboundOrderDetailRepository
.Db.Queryable<Dt_InboundOrderDetail>()
.Where(d => d.OrderId == inboundOrder.Id && d.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
.Count();
@@ -821,7 +1131,7 @@
_inboundRepository.InboundOrderRepository.DeleteAndMoveIntoHty(inboundOrder, OperateType.浜哄伐鍙栨秷);
}
//濡傛灉鍙栨秷浠ュ悗鏄庣粏宸茬粡鍏ㄩ儴瀹屾垚
- if (remainingDetailsCount == overCount)
+ if (remainingDetailsCount == overCount)
{
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
@@ -852,12 +1162,12 @@
Random random = new Random();
List<Dt_ReturnOrder> returnOrders = new List<Dt_ReturnOrder>();
_unitOfWorkManage.BeginTran();
- foreach(var item in houseReturnOrder)
+ foreach (var item in houseReturnOrder)
{
int randomNum = random.Next(1, 1000);
string datePart = DateTime.Now.ToString("yyyyMMdd");
Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == item.LPNNo && x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
- if(returnOrder == null)
+ if (returnOrder == null)
{
Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
{
@@ -884,7 +1194,7 @@
if (stockInfo == null)
{
Dt_Warehouse warehouse = _warehouseService.Repository.QueryData(x => x.WarehouseCode == item.WarehouseCode).FirstOrDefault();
- if(warehouse == null)
+ if (warehouse == null)
{
return WebResponseContent.Instance.Error($"璇ヤ粨搴撶紪鍙穥item.WarehouseCode}鏈厤缃�");
}
@@ -915,19 +1225,19 @@
Materialweight = 0,
Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
Mgeneratetime = DateTime.Now,
- Details = new List<Dt_StockInfoDetail> { stockInfoDetail}
+ Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
};
Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
}
else
{
- outboundOrderDetail = new Dt_OutboundOrderDetail
+ outboundOrderDetail = new Dt_OutboundOrderDetail
{
MaterielCode = item.MaterielCode,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
BatchNo = item.BatchNo,
- OrderQuantity = stockInfo.Details.Sum(x=>x.StockQuantity),
+ OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
Remark = item.Remark,
LinId = item.LinId,
LPNNo = item.LPNNo,
@@ -935,7 +1245,7 @@
CreateDate = DateTime.Now,
LocationName = item.LocationCode
};
- outboundOrder = new Dt_OutboundOrder
+ outboundOrder = new Dt_OutboundOrder
{
OrderNo = "FJCK" + $"{datePart}{randomNum}",
UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
@@ -947,10 +1257,10 @@
CreateDate = DateTime.Now,
CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
- };
+ };
Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
}
-
+
}
else
{
@@ -965,13 +1275,13 @@
returnOrder.ReceiptQuantity += item.OrderQuantity;
_returnOrderRepository.UpdateData(returnOrder);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
-
+
}
}
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
}
- catch(Exception ex)
+ catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
@@ -986,7 +1296,7 @@
List<string> materielCodes = materielInfos.Select(x => x.MaterielCode).Distinct().ToList();
return WebResponseContent.Instance.OK("鎴愬姛", data: materielCodes);
}
- catch(Exception ex)
+ catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
--
Gitblit v1.9.3