From a23f4d86c588a3fa0bc23e5252bc1ddd1f5a1787 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 08 一月 2025 23:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 201 +++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 83 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 6b37125..2fc9210 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"
@@ -25,6 +25,7 @@
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
+using WIDESEA_DTO.MES;
using WIDESEA_External.ERPService;
using WIDESEA_External.Model;
using WIDESEA_IBasicRepository;
@@ -35,6 +36,7 @@
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoRepository;
+using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using WIDESEA_StockRepository;
@@ -215,6 +217,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -270,7 +273,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)
{
@@ -344,6 +347,24 @@
if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
stockInfo.Remark = Initiallife.ToString();
+ string batchNo = models.FirstOrDefault()?.LotNo ?? "";
+ Dt_StockInfoDetail existDetail = _stockRepository.StockInfoDetailRepository.QueryFirst(x => x.BatchNo == batchNo);
+ if (existDetail != null)
+ {
+ return WebResponseContent.Instance.Error($"{batchNo}娴嬭瘯鏋跺凡瀛樺湪");
+ }
+ if (models.Count>=2)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
+ }
+ 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>();
@@ -371,6 +392,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -444,6 +466,7 @@
float beforeQuantity = 0;
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()
@@ -466,7 +489,25 @@
if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
{
+ string batchNo = models.FirstOrDefault()?.LotNo ?? "";
+ Dt_StockInfoDetail existDetail = _stockRepository.StockInfoDetailRepository.QueryFirst(x => x.BatchNo == batchNo);
+ if (existDetail != null)
+ {
+ return WebResponseContent.Instance.Error($"{batchNo}娴嬭瘯鏋跺凡瀛樺湪");
+ }
+ if (models.Count >= 2)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
+ }
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>();
@@ -482,6 +523,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit= materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -557,16 +599,8 @@
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);
- }
+ //鎺ㄩ�丒RP 娴嬭瘯娉ㄩ噴
+ _invokeERPService.InvokeInboundOrderApi(model);
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -581,81 +615,82 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public WebResponseContent FeedbackInboundOrder(int id)
- {
- try
- {
- Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
- if (inboundOrder == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
- }
- if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
- }
- if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟嵁宸插畬鎴�");
- }
+ //public WebResponseContent FeedbackInboundOrder(int id)
+ //{
+ // try
+ // {
+ // Dt_InboundOrder inboundOrder = Db.Queryable<Dt_InboundOrder>().Where(x => x.Id == id).Includes(x => x.Details).First();
+ // if (inboundOrder == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟淇℃伅");
+ // }
+ // if (inboundOrder.Details == null || inboundOrder.Details.Count == 0)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
+ // }
+ // if (inboundOrder.OrderStatus == InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ // {
+ // 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();
- List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList();
+ // List<Dt_StockInfo> stockInfos = Db.Queryable<Dt_StockInfo>().Where(x => x.Details.Any(v => v.OrderNo == inboundOrder.InboundOrderNo)).Includes(x => x.Details).ToList();
+ // List<Dt_Warehouse> warehouses = Db.Queryable<Dt_Warehouse>().ToList();
- List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
- foreach (var item in inboundOrder.Details)
- {
- Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode));
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
- }
+ // List<ERPInboundDetailModel> detailModels = new List<ERPInboundDetailModel>();
+ // foreach (var item in inboundOrder.Details)
+ // {
+ // Dt_StockInfo? stockInfo = stockInfos.FirstOrDefault(x => x.Details.Any(v => v.InboundOrderRowNo == item.RowNo && v.MaterielCode == item.MaterielCode));
+ // if (stockInfo == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒板簱瀛樹俊鎭�");
+ // }
- Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId);
- if (warehouse == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
- }
+ // Dt_Warehouse? warehouse = warehouses.FirstOrDefault(x => x.WarehouseId == stockInfo.WarehouseId);
+ // if (warehouse == null)
+ // {
+ // return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
+ // }
- ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
- {
- ExpiryDate = stockInfo.Details.FirstOrDefault()?.EffectiveDate ?? "",
- LocationCode = warehouse.WarehouseCode,
- MaterialsCode = item.MaterielCode,
- MfgDate = stockInfo.Details.FirstOrDefault()?.ProductionDate ?? "",
- QtyCustoms = "0",
- Quantity = stockInfo.Details.Sum(x => x.StockQuantity).ToString(),
- Rack = stockInfo.LocationCode,
- ReceiptCode = inboundOrder.UpperOrderNo,
- ReceiptSerNo = item.RowNo.ToString()
- };
- detailModels.Add(detailModel);
- }
- Dt_Warehouse? warehouse2 = warehouses.FirstOrDefault(x => x.WarehouseId == inboundOrder.WarehouseId);
- if (warehouse2 == 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 = warehouse2.WarehouseCode,
- Way = 1,
- Details = detailModels
- };
- string response = _invokeERPService.InvokeInboundOrderApi(model);
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
+ // ERPInboundDetailModel detailModel = new ERPInboundDetailModel()
+ // {
+ // ExpiryDate = stockInfo.Details.FirstOrDefault()?.EffectiveDate ?? "",
+ // LocationCode = warehouse.WarehouseCode,
+ // MaterialsCode = item.MaterielCode,
+ // MfgDate = stockInfo.Details.FirstOrDefault()?.ProductionDate ?? "",
+ // QtyCustoms = "0",
+ // Quantity = stockInfo.Details.Sum(x => x.StockQuantity).ToString(),
+ // Rack = stockInfo.LocationCode,
+ // ReceiptCode = inboundOrder.UpperOrderNo,
+ // ReceiptSerNo = item.RowNo.ToString()
+ // };
+ // detailModels.Add(detailModel);
+ // }
+ // Dt_Warehouse? warehouse2 = warehouses.FirstOrDefault(x => x.WarehouseId == inboundOrder.WarehouseId);
+ // if (warehouse2 == 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 = warehouse2.WarehouseCode,
+ // Way = 1,
+ // Details = detailModels
+ // };
+ // //娴嬭瘯娉ㄩ噴
+ // _invokeERPService.InvokeInboundOrderApi(model);
+ // return WebResponseContent.Instance.OK();
+ // }
+ // catch (Exception ex)
+ // {
+ // return WebResponseContent.Instance.Error(ex.Message);
+ // }
+ //}
}
}
--
Gitblit v1.9.3