From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 377 insertions(+), 16 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index da8a5a3..5166513 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -1,5 +1,6 @@
锘縰sing AutoMapper;
using MailKit.Search;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -12,6 +13,7 @@
using WIDESEA_BasicRepository;
using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -21,6 +23,7 @@
using WIDESEA_Core.Utilities;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
using WIDESEA_IBasicRepository;
@@ -32,6 +35,7 @@
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Inbound;
using static WIDESEA_Common.HouseInventoryIn;
namespace WIDESEA_InboundService
@@ -51,10 +55,11 @@
private IWarehouseService _warehouseService;
private readonly IStockRepository _stockRepository;
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) : 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;
@@ -69,6 +74,7 @@
_warehouseService = warehouseService;
_stockRepository = stockRepository;
_palletTypeInfoRepository = palletTypeInfoRepository;
+ _returnOrderRepository = returnOrderRepository;
}
/// <summary>
@@ -86,7 +92,53 @@
var palletCode = saveModel.MainData["palletCode"].ToString();
var warehouseId = saveModel.MainData["warehouseId"].ObjToInt();
var Initiallife = saveModel.MainData["initiallife"].ObjToInt();
- var serNums = saveModel.DelKeys.Select(x => x.ToString()).ToList();
+ List<string> serialNumbers = new List<string>();
+ List<decimal> quantitys = new List<decimal>();
+ foreach (var item in saveModel.DelKeys)
+ {
+ string json = JsonConvert.SerializeObject(item);
+ Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+
+
+ if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
+ {
+ string serialNumber = serialNumberObj?.ToString();
+ if (!string.IsNullOrEmpty(serialNumber))
+ {
+ serialNumbers.Add(serialNumber);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
+ }
+ }
+ if (delKeyDict.TryGetValue("quantity", out object quantityObj))
+ {
+ if (quantityObj == null)
+ {
+ return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺鐨勫�间负绌�");
+ }
+ decimal quantity;
+ try
+ {
+ quantity = Convert.ToDecimal(quantityObj);
+ }
+ catch
+ {
+ return WebResponseContent.Instance.Error($"鐗╂枡鏁伴噺{quantityObj}鏃犳硶杞崲涓烘暟瀛�");
+ }
+ if (quantity <= 0)
+ {
+ return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
+ }
+
+ quantitys.Add(quantity);
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁");
+ }
+ }
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
{
@@ -102,7 +154,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
- List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);
+ List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);
//楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
WebResponseContent IsValidContent = IsValidMCDates(models);
if (!IsValidContent.Status)
@@ -116,14 +168,15 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
-
- List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).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();
+
//Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(palletCode);
decimal beforeQuantity = 0;
@@ -190,7 +243,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.BatchNo == 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)
{
@@ -203,12 +256,14 @@
OrderNo = inboundOrder.OrderNo,
BatchNo = inboundOrderDet.BatchNo,
LinId = inboundOrderDet.LinId,
- StockQuantity = model.Quantity,
+ StockQuantity = (quantitys.FirstOrDefault()),
Status = (int)StockStatusEmun.缁勭洏鏆傚瓨,
Creater = "WMS",
CreateDate = DateTime.Now,
Id = inboundOrderDet.LinId.ObjToInt(),
- DeliveryNote = model.DeliveryNote
+ DeliveryNote = model.DeliveryNote,
+ SupplierBatch = inboundOrderDet.SupplierBatch,
+ MaterieSpec = inboundOrderDet.MaterieSpec
};
if (stockInfo.Id > 0)
@@ -220,7 +275,7 @@
stockInfoDetails.Add(stockInfoDetail);
decimal decimalReceiptQuantity = Convert.ToDecimal(notGroupDetail.ReceiptQuantity);
- decimal decimalModelQuantity = Convert.ToDecimal(model.Quantity);
+ decimal decimalModelQuantity = Convert.ToDecimal((quantitys.FirstOrDefault()));
decimal decimalOrderQuantity = Convert.ToDecimal(notGroupDetail.OrderQuantity);
decimalReceiptQuantity += decimalModelQuantity;
// 妫�鏌ユ槸鍚﹁秴鍑鸿鍗曟暟閲�
@@ -361,6 +416,7 @@
WebResponseContent content = new WebResponseContent();
try
{
+ _unitOfWorkManage.BeginTran();
foreach (var item in model.DetailList)
{
//鑾峰彇鐗╂枡淇℃伅
@@ -374,13 +430,19 @@
{
return content.Error($"鏈壘鍒颁粨搴撲俊鎭�");
}
+ 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 != OrderDetailStatusEnum.New.ObjToInt())
{
return content.Error($"{model.AsnNo}鍗曟嵁宸插紑濮�!");
}
+ 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)
{
@@ -391,6 +453,7 @@
{
Dt_InboundOrderDetail orderDetail = new Dt_InboundOrderDetail()
{
+ OrderId = orderDetail1.OrderId,
MaterielCode = item.MaterielCode,
BatchNo = item.BatchNo,
OrderQuantity = item.OrderQuantity,
@@ -401,7 +464,8 @@
LPNNo = item.LPN_No,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
- Creater = "涓婃父WMS"
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch
};
_inboundRepository.InboundOrderDetailRepository.AddData(orderDetail);
}
@@ -420,7 +484,8 @@
LPNNo = item.LPN_No,
MaterielName = item.MaterielName,
MaterieSpec = item.MaterieSpec,
- Creater = "涓婃父WMS"
+ Creater = "涓婃父WMS",
+ SupplierBatch = item.SupplierBatch
};
Dt_InboundOrder inboundOrder = new Dt_InboundOrder()
@@ -436,6 +501,7 @@
InoutType = model.OrderType,
OrderType = model.InoutType.ObjToInt(),
Creater = "涓婃父WMS",
+ System = model.System,
Details = new List<Dt_InboundOrderDetail> { orderDetail }
};
//switch (model.OrderType)//鍗曟嵁绫诲瀷
@@ -453,13 +519,11 @@
// break;
//};
Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+
}
}
+ _unitOfWorkManage.CommitTran();
content = WebResponseContent.Instance.OK();
-
-
-
-
//InboundOrderAddDTO orderAddDTO1 = new InboundOrderAddDTO();
//orderAddDTO1.OrderNo = orderAddDTO.AsnNo;
//orderAddDTO1.UpperOrderNo = orderAddDTO.AsnNo;
@@ -482,7 +546,9 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error(ex.Message);
+
}
finally
{
@@ -632,6 +698,301 @@
return content;
}
+ public WebResponseContent Save(AddInboundOrderModel addInboundOrder)
+ {
+ try
+ {
+ List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
+ Random random = new Random();
+ if (addInboundOrder.Details != null)
+ {
+ foreach (var model in addInboundOrder.Details)
+ {
+ // 鐢熸垚3浣嶉殢鏈烘暟锛�1-999涔嬮棿锛�
+ int randomNum = random.Next(1, 1000);
+
+ // 鏍煎紡鍖栧綋鍓嶆棩鏈熶负骞存湀鏃ワ紙渚嬪锛�20230820锛�
+ string datePart = DateTime.Now.ToString("yyyyMMdd");
+ Dt_InboundOrderDetail inboundOrderDetail = new Dt_InboundOrderDetail()
+ {
+ MaterielCode = model.MaterielCode,
+ MaterielName = model.MaterielName,
+ SupplierBatch = model.SupplierBatch,
+ OrderQuantity = model.OrderQuantity,
+ BatchNo ="PC"+$"{datePart}{randomNum}",
+ OrderDetailStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+
+ };
+ inboundOrderDetails.Add(inboundOrderDetail);
+ }
+ }
+ int randomNum2 = random.Next(1, 1000);
+ string datePart2 = DateTime.Now.ToString("yyyyMMdd");
+ Dt_InboundOrder erpProScrapSheet = new Dt_InboundOrder()
+ {
+ OrderNo = "WMSIN" + $"{datePart2}{randomNum2}",
+ UpperOrderNo = "WMSIN" + $"{datePart2}{randomNum2}",
+ WarehouseId = addInboundOrder.WarehouseId,
+ OrderType = OrderTypeEnum.鐢熶骇鍏ュ簱鍗�.ObjToInt(),
+ InoutType = InoutTypeEnum.OtherIn.ToString(),
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ CreateType = OrderCreateTypeEnum.CreateInSystem.ObjToInt(),
+ System = "WMS",
+ Details = inboundOrderDetails,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ };
+ _unitOfWorkManage.BeginTran();
+ Db.InsertNav(erpProScrapSheet).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
+ }
+
+ public string CancelInMaterialWarehousing = WIDESEA_Core.Helper.AppSettings.Configuration["CancelInMaterialWarehousing"];
+ /// <summary>
+ /// 鍏ュ簱鍗曟嵁鍙栨秷鎺ㄩ�丒RP
+ /// </summary>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ public WebResponseContent FeedbackInboundCanceERP(int[] keys)
+ {
+ try
+ {
+ List<Dt_InboundOrderDetail> inboundOrderDetails = _inboundRepository.InboundOrderDetailRepository.QueryData(x => keys.Contains(x.Id));
+
+ if (inboundOrderDetails == null || inboundOrderDetails.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ }
+ if (inboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
+ {
+ return WebResponseContent.Instance.Error("鎵�閫夊叆搴撳崟鏄庣粏瀛樺湪鍏ュ簱涓垨宸插畬鎴�");
+ }
+ Dt_InboundOrder inboundOrder = _inboundRepository.InboundOrderRepository.QueryFirst(x => x.Id == inboundOrderDetails[0].OrderId);
+ if (inboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈�氳繃璇ユ槑缁嗘壘鍒板叆搴撳崟淇℃伅");
+ }
+ if (!inboundOrder.System.Equals("ERP"))
+ {
+ return WebResponseContent.Instance.Error("璇ュ叆搴撳崟鎹潪ERP鎺ㄩ�侊紝鏃犳硶鍙栨秷");
+ }
+ List<FeedbackInboundOrderERP> feedbackInboundOrders = new List<FeedbackInboundOrderERP>();
+ foreach (var item in inboundOrderDetails)
+ {
+ FeedbackInboundOrderERP feedbackInbound = new FeedbackInboundOrderERP()
+ {
+ code = inboundOrder.UpperOrderNo,
+ itemId = item.LinId,
+ };
+ feedbackInboundOrders.Add(feedbackInbound);
+ }
+
+ var response = HttpHelper.Post<WebResponseContent>(CancelInMaterialWarehousing, feedbackInboundOrders, "鍏ュ簱鏄庣粏鍙栨秷鍥炰紶ERP");
+ _unitOfWorkManage.BeginTran();
+ if (response.Code == 0)
+ {
+ _inboundRepository.InboundOrderDetailRepository.DeleteAndMoveIntoHty(inboundOrderDetails, OperateType.浜哄伐鍙栨秷);
+
+ //妫�鏌ヨ涓昏鍗曟槸鍚﹁繕鏈夊墿浣欐槑缁�
+ int remainingDetailsCount = _inboundRepository.InboundOrderDetailRepository
+ .Db.Queryable<Dt_InboundOrderDetail>()
+ .Where(d => d.OrderId == inboundOrder.Id)
+ .Count();
+
+ // 濡傛灉娌℃湁鍓╀綑鏄庣粏锛屽啀鍒犻櫎涓昏鍗�
+ if (remainingDetailsCount == 0)
+ {
+ _inboundRepository.InboundOrderRepository.DeleteAndMoveIntoHty(inboundOrder, OperateType.浜哄伐鍙栨秷);
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent ReceiveReturnOrder(List<HouseReturnOrder> houseReturnOrder)
+ {
+ try
+ {
+ Random random = new Random();
+ List<Dt_ReturnOrder> returnOrders = new List<Dt_ReturnOrder>();
+ _unitOfWorkManage.BeginTran();
+ 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)
+ {
+ Dt_ReturnOrder newReturnOrder = new Dt_ReturnOrder
+ {
+ OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt(),
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ BatchNo = item.BatchNo,
+ OrderQuantity = item.OrderQuantity,
+ Remark = item.Remark,
+ LinId = item.LinId,
+ LPNNo = item.LPNNo,
+ LocationCode = item.LocationCode,
+ WarehouseCode = item.WarehouseCode,
+ System = item.System,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now
+ };
+ _returnOrderRepository.AddData(newReturnOrder);
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.LocationCode == item.LocationCode).First();
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
+ Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder();
+ if (stockInfo == null)
+ {
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryData(x => x.WarehouseCode == item.WarehouseCode).FirstOrDefault();
+ if(warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"璇ヤ粨搴撶紪鍙穥item.WarehouseCode}鏈厤缃�");
+ }
+ Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail
+ {
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ BatchNo = item.BatchNo,
+ LinId = item.LinId,
+ Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ OrderNo = newReturnOrder.OrderNo,
+ StockQuantity = item.OrderQuantity,
+ };
+ Dt_StockInfo stockInfo1 = new Dt_StockInfo
+ {
+ PalletCode = item.LPNNo,
+ WarehouseId = warehouse.WarehouseId,
+ BatchNo = item.BatchNo,
+ PalletType = GetPalletType(warehouse, item.LPNNo),
+ IsFull = true,
+ StockStatus = (int)StockStatusEmun.鍙嶆嫞鍏ュ簱,
+ Creater = "WMS",
+ CreateDate = DateTime.Now,
+ MaterialType = (int)InventoryMaterialType.鍘熸潗鏂�,
+ Materialweight = 0,
+ Wlstatus = (int)InventoryMaterialStatus.鍚堟牸,
+ Mgeneratetime = DateTime.Now,
+ Details = new List<Dt_StockInfoDetail> { stockInfoDetail}
+ };
+ Db.InsertNav(stockInfo1).Include(x => x.Details).ExecuteCommand();
+ }
+ else
+ {
+ outboundOrderDetail = new Dt_OutboundOrderDetail
+ {
+ MaterielCode = item.MaterielCode,
+ MaterielName = item.MaterielName,
+ MaterieSpec = item.MaterieSpec,
+ BatchNo = item.BatchNo,
+ OrderQuantity = stockInfo.Details.Sum(x=>x.StockQuantity),
+ Remark = item.Remark,
+ LinId = item.LinId,
+ LPNNo = item.LPNNo,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ LocationName = item.LocationCode
+ };
+ outboundOrder = new Dt_OutboundOrder
+ {
+ OrderNo = "FJCK" + $"{datePart}{randomNum}",
+ UpperOrderNo = "WMSFJCK" + $"{datePart}{randomNum}",
+ OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ OrderType = OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt(),
+ InoutType = InoutTypeEnum.OtherOut.ToString(),
+ System = item.System,
+ Creater = "SMOM",
+ CreateDate = DateTime.Now,
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ };
+ Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
+ }
+
+ }
+ else
+ {
+ Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo, Dt_StockInfoDetail>((stock, detail) => stock.Id == detail.StockId).Where((stock, detail) => stock.PalletCode == item.LPNNo && stock.StockStatus == StockStatusEmun.浣欐枡閫�搴�.ObjToInt()).First();
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ returnOrder.LinId = item.LinId;
+ returnOrder.System = item.System;
+ returnOrder.WarehouseCode = item.WarehouseCode;
+ returnOrder.LocationCode = item.LocationCode;
+ returnOrder.OrderType = OrderTypeEnum.鍙嶆嫞鍥炲簱鍗�.ObjToInt();
+ returnOrder.OrderQuantity += item.OrderQuantity;
+ returnOrder.ReceiptQuantity += item.OrderQuantity;
+ _returnOrderRepository.UpdateData(returnOrder);
+ _stockRepository.StockInfoRepository.UpdateData(stockInfo);
+
+ }
+ }
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch(Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent GetMaterielCode(int warehouseId)
+ {
+ try
+ {
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouseId).ToList();
+ List<string> materielCodes = materielInfos.Select(x => x.MaterielCode).Distinct().ToList();
+ return WebResponseContent.Instance.OK("鎴愬姛", data: materielCodes);
+ }
+ catch(Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent GetMaterielName(int warehouseId, string materielCode)
+ {
+ try
+ {
+ List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouseId && x.MaterielCode == materielCode).ToList();
+ List<string> materielNames = materielInfos.Select(x => x.MaterielName).Distinct().ToList();
+ return WebResponseContent.Instance.OK("鎴愬姛", data: materielNames);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 楠岃瘉鍗曟嵁娣诲姞DTO瀵硅薄
/// </summary>
--
Gitblit v1.9.3