From 554ebff8616f1ed2fc578cde80642791cfaff476 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 02 一月 2025 09:29:04 +0800
Subject: [PATCH] 出库完成等代码更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 193 ++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 94 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index 2363716..c170722 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -1,5 +1,7 @@
锘縰sing AutoMapper;
using HslCommunication.WebSocket;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -72,21 +74,21 @@
try
{
//鑾峰彇浠撳簱淇℃伅
- Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x=>x.WarehouseCode==erpInOrder.WaId);
- if (warehouse==null)
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseCode == erpInOrder.WaId);
+ if (warehouse == null)
{
return content.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
//鑾峰彇鏄惁瀛樺湪璁㈠崟
- Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x=>x.InboundOrderNo== erpInOrder.OrderNo);
- if (erpInOrder.Way==1)
+ Dt_InboundOrder inboundOrder = BaseDal.QueryFirst(x => x.InboundOrderNo == erpInOrder.OrderNo);
+ if (erpInOrder.Way == 1)
{
- if (inboundOrder!=null)
+ if (inboundOrder != null)
{
}
}
- else if(erpInOrder.Way==2)
+ else if (erpInOrder.Way == 2)
{
}
@@ -144,7 +146,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
}
- if (inboundOrder.OrderStatus>=InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ if (inboundOrder.OrderStatus >= InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
{
return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡缁撴潫");
}
@@ -152,17 +154,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
- MatSerNumAnalysisModel model = new MatSerNumAnalysisModel()
- {
- MaterielCode = "504907335",
- LotNo = "20241217001",
- ProductionDate = "2024-12-17",
- EffectiveDate = "2025-12-17",
- PurchaseOrderNo = "POHA02241227285",
- Quantity = 1,
- SerialNumber = "M:504907335,BS:20241217001,DM:2024-12-17,DE:2025-12-17,Q:1,PO:POHA02241227285"
- };//娴嬭瘯
- //CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNum);
+ MatSerNumAnalysisModel model = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNum);
Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == model.MaterielCode);
if (materielInfo == null)
{
@@ -196,11 +188,11 @@
{
return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
}
- if (inboundOrderDetail.OrderDetailStatus>OrderDetailStatusEnum.GroupAndInbound.ObjToInt())
+ if (inboundOrderDetail.OrderDetailStatus > OrderDetailStatusEnum.GroupAndInbound.ObjToInt())
{
return WebResponseContent.Instance.Error($"瀵瑰簲鍏ュ簱鍗曟槑缁嗗凡缁撴潫");
}
- float inboundDetailSum = inboundOrderDetail.OverInQuantity + inboundOrderDetail.ReceiptQuantity ;
+ float inboundDetailSum = inboundOrderDetail.OverInQuantity + inboundOrderDetail.ReceiptQuantity;
if (inboundDetailSum == inboundOrderDetail.OrderQuantity)
{
return WebResponseContent.Instance.Error($"璇ョ墿鏂欏叆搴撳崟鏄庣粏宸插叏閮ㄧ粍鐩樺畬鎴�");
@@ -210,7 +202,7 @@
return WebResponseContent.Instance.Error($"涓庤鏀惰揣鍗曟槑缁嗘敹璐ф暟閲忎笉涓�鑷�");
}
Dt_StockInfo oldStockinfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
- if(oldStockinfo!=null)
+ if (oldStockinfo != null)
{
return WebResponseContent.Instance.Error($"鎵樼洏閲嶅");
}
@@ -234,11 +226,11 @@
PalletCode = palletCode,
StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
WarehouseId = inboundOrder.WarehouseId,
- Details=new List<Dt_StockInfoDetail> { stockInfoDetail }
+ Details = new List<Dt_StockInfoDetail> { stockInfoDetail }
};
inboundOrderDetail.ReceiptQuantity += model.Quantity;
_unitOfWorkManage.BeginTran();
- if (inboundOrderDetail.OrderDetailStatus==OrderDetailStatusEnum.New.ObjToInt())
+ if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
{
inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
}
@@ -278,7 +270,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
-
+
Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == orderNo && x.WarehouseId == warehouse.WarehouseId).Includes(x => x.Details).First();
if (inboundOrder == null)
{
@@ -352,6 +344,14 @@
if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
stockInfo.Remark = Initiallife.ToString();
+ if (palletCode.Substring(0, 1) == "6")
+ {
+ stockInfo.PalletType = PalletTypeEnum.MediumPallet.ObjToInt();
+ }
+ else
+ {
+ stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
+ }
}
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
@@ -424,31 +424,16 @@
return content;
}
- public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
+ public WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == inboundOrderId).Includes(x => x.Details).First();
- if (inboundOrder == null)
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
+ if (warehouse == null)
{
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
}
- if (inboundOrder.Details == null || inboundOrder.Details.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
- }
-
- Dt_ReceiveOrder receiveOrder = _inboundRepository.ReceiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == inboundOrder.UpperOrderNo).Includes(x => x.Details).First();
- if (receiveOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鏀惰揣鍗�");
- }
- if (receiveOrder.Details == null || receiveOrder.Details.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鏀惰揣鍗曟槑缁�");
- }
-
- List<string> purchaseOrderNos = receiveOrder.Details.Select(x => x.PurchaseOrderNo).ToList();
List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serNums);
@@ -464,17 +449,6 @@
return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡鐨勪俊鎭�");
}
- List<Dt_InboundOrderDetail> inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode).ToList();
-
- if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
- {
- return WebResponseContent.Instance.Error($"鏈湪鍏ュ簱鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
- }
- if (receiveOrder.Details.FirstOrDefault(x => x.MaterielCode == materielCode) == null)
- {
- return WebResponseContent.Instance.Error($"鏈湪鏀惰揣鍗曟槑缁嗕腑鎵惧埌璇ョ墿鏂欎俊鎭�");
- }
-
float beforeQuantity = 0;
Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
@@ -483,50 +457,51 @@
stockInfo = new Dt_StockInfo()
{
PalletCode = palletCode,
- StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
- WarehouseId = inboundOrder.WarehouseId,
+ StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
Details = new List<Dt_StockInfoDetail>()
};
}
else
{
- if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
+ if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
{
return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�");
}
beforeQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
}
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ stockInfo.Remark = Initiallife.ToString();
+ if (palletCode.Substring(0, 1) == "6")
+ {
+ stockInfo.PalletType = PalletTypeEnum.MediumPallet.ObjToInt();
+ }
+ else
+ {
+ stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
+ }
+ }
+
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
List<int> detailKeys = new List<int>();
foreach (var model in models)
{
- if (purchaseOrderNos.FirstOrDefault(x => x == model.PurchaseOrderNo) == null)
- {
- return WebResponseContent.Instance.Error($"鏈湪鏀惰揣鍗曟槑缁嗕腑鎵惧埌璇ラ噰璐崟");
- }
-
- Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() && x.OrderQuantity == model.Quantity && !detailKeys.Contains(x.Id) && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
-
- if (notGroupDetail == null)
- {
- return WebResponseContent.Instance.Error($"璇ョ墿鏂欏湪璇ュ叆搴撳崟涓凡鍏ㄩ儴缁勭洏瀹屾垚");
- }
- detailKeys.Add(notGroupDetail.Id);
Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
{
BatchNo = model.LotNo,
MaterielCode = materielInfo.MaterielCode,
MaterielName = materielInfo.MaterielName,
- OrderNo = inboundOrder.InboundOrderNo,
+ OrderNo = "",
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
- InboundOrderRowNo = notGroupDetail.RowNo,
+ InboundOrderRowNo = 0,
};
if (stockInfo.Id > 0)
@@ -536,14 +511,9 @@
stockInfo.Details.Add(stockInfoDetail);
stockInfoDetails.Add(stockInfoDetail);
-
- notGroupDetail.ReceiptQuantity = model.Quantity;
- notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
}
float totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
-
- inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
_unitOfWorkManage.BeginTran();
if (stockInfo.Id == 0)
@@ -554,25 +524,66 @@
{
_stockRepository.StockInfoRepository.Db.UpdateNav(stockInfo).Include(x => x.Details, new UpdateNavOptions() { OneToManyInsertOrUpdate = true }).ExecuteCommand();
}
- _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetails);
- _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
-
- return WebResponseContent.Instance.OK();
+ content.OK();
}
catch (Exception ex)
{
_unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
- public WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo)
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚涓婃姤ERP
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent FeedbackInboundOrder(Dt_StockInfo stockInfo, Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels)
{
- WebResponseContent content=new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
try
{
+ if (inboundOrder.Details.Count == 0)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ }
+ if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
+ }
+ Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == stockInfo.WarehouseId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ }
+
+ ERPInboundModel model = new ERPInboundModel()
+ {
+ Code = inboundOrder.InboundOrderNo,
+ CreatorCode = inboundOrder.Creater,//娴嬭瘯
+ EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
+ StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ SuppliersId = inboundOrder.SupplierId,
+ Type = "S",
+ UniqueTag = inboundOrder.Id.ToString(),
+ WarehouseCode = warehouse.WarehouseCode,
+ Way = 1,
+ Details = detailModels
+ };
+ string response = _invokeERPService.InvokeInboundOrderApi(model);
+ ErpRequestContent? requestContent = JsonConvert.DeserializeObject<ErpRequestContent>(response);
+ if (requestContent == null)
+ {
+ return WebResponseContent.Instance.Error();
+ }
+ if (requestContent.res == 0)
+ {
+ return WebResponseContent.Instance.Error(requestContent.Data);
+ }
+ return WebResponseContent.Instance.OK();
}
catch (Exception ex)
{
@@ -582,7 +593,7 @@
}
/// <summary>
- /// 鍏ュ簱瀹屾垚鍥炰紶鍒癊RP 娴嬭瘯
+ /// 鍏ュ簱瀹屾垚鍥炰紶鍒癊RP
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
@@ -599,13 +610,9 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
- if (inboundOrder.OrderStatus != InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
{
- return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁鏈畬鎴�");
- }
- if (inboundOrder.Details.FirstOrDefault(x => x.OrderDetailStatus != OrderDetailStatusEnum.Over.ObjToInt()) != null)
- {
- return WebResponseContent.Instance.Error($"鍏ュ簱鏄庣粏鏈畬鎴�");
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
}
List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList();
@@ -648,7 +655,7 @@
ERPInboundModel model = new ERPInboundModel()
{
Code = inboundOrder.InboundOrderNo,
- CreatorCode = "TC20082",//娴嬭瘯
+ CreatorCode = inboundOrder.Creater,//娴嬭瘯
EntDate = inboundOrder.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
SuppliersId = inboundOrder.SupplierId,
@@ -658,9 +665,7 @@
Way = 1,
Details = detailModels
};
-
string response = _invokeERPService.InvokeInboundOrderApi(model);
-
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3