From c383154f87b2da856668f7c66e3001d4f79ac7da Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:27:25 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 94 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 40 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 c170722..a3b3f9a 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;
@@ -50,10 +52,11 @@
private readonly IRecordService _recordService;
private readonly IInvokeERPService _invokeERPService;
private readonly IWarehouseService _warehouseService;
+ private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
public IInboundOrderRepository Repository => BaseDal;
- public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IInboundRepository inboundRepository, IBasicRepository basicRepository, IStockRepository stockRepository, IRecordService recordService, IInvokeERPService invokeERPService, IWarehouseService warehouseService) : base(BaseDal)
+ public InboundOrderService(IInboundOrderRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IInboundRepository inboundRepository, IBasicRepository basicRepository, IStockRepository stockRepository, IRecordService recordService, IInvokeERPService invokeERPService, IWarehouseService warehouseService, IPalletTypeInfoRepository palletTypeInfoRepository) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -63,6 +66,7 @@
_recordService = recordService;
_invokeERPService = invokeERPService;
_warehouseService = warehouseService;
+ _palletTypeInfoRepository = palletTypeInfoRepository;
}
/// <summary>
/// 鍏朵粬鍏ュ簱鍗曞垱寤�
@@ -215,6 +219,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -270,7 +275,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)
{
@@ -328,7 +333,7 @@
PalletCode = palletCode,
StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
WarehouseId = inboundOrder.WarehouseId,
- PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
+ PalletType = GetPalletType(warehouse, palletCode, materielInfo),
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -341,18 +346,7 @@
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>();
@@ -379,6 +373,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -414,6 +409,14 @@
_inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
+ //if (warehouse.WarehouseCode==WarehouseEnum.HA153.ToString())
+ //{
+ // //鍚屾娴嬭瘯鏋朵俊鎭�
+ // foreach (var model in models)
+ // {
+ // _taskService.TestSynStock(new TestToolSynInfo() { ToolCode = model.LotNo, Life = Initiallife });
+ // }
+ //}
content.OK();
}
catch (Exception ex)
@@ -459,7 +462,7 @@
PalletCode = palletCode,
StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt(),
WarehouseId = warehouse.WarehouseId,
- PalletType = PalletTypeEnum.SmallPallet.ObjToInt(),
+ PalletType = GetPalletType(warehouse, palletCode, materielInfo),
Details = new List<Dt_StockInfoDetail>()
};
}
@@ -470,19 +473,6 @@
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>();
@@ -498,6 +488,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(),
ProductionDate = model.ProductionDate,
EffectiveDate = model.EffectiveDate,
@@ -526,6 +517,11 @@
}
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
+ //鍚屾娴嬭瘯鏋朵俊鎭�
+ //foreach (var model in models)
+ //{
+ // _taskService.TestSynStock(new TestToolSynInfo() { ToolCode = model.LotNo, Life = Initiallife });
+ //}
content.OK();
}
catch (Exception ex)
@@ -573,16 +569,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)
@@ -665,7 +653,8 @@
Way = 1,
Details = detailModels
};
- string response = _invokeERPService.InvokeInboundOrderApi(model);
+ //娴嬭瘯娉ㄩ噴
+ _invokeERPService.InvokeInboundOrderApi(model);
return WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -673,5 +662,30 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+ public int GetPalletType(Dt_Warehouse warehouse, string palletCode, Dt_MaterielInfo materielInfo)
+ {
+ if (warehouse.WarehouseCode == WarehouseEnum.HA64.ToString())
+ {
+ if (palletCode.Substring(0, 1) == "6")
+ {
+ return PalletTypeEnum.MediumPallet.ObjToInt();
+ }
+ else
+ {
+ return PalletTypeEnum.LargestPallet.ObjToInt();
+ }
+ }
+ else if (warehouse.WarehouseCode == WarehouseEnum.HA152.ObjToString())
+ {
+ Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
+ if(palletTypeInfo == null)
+ {
+ throw new Exception($"鎵樼洏鍙烽敊璇�");
+ }
+ return palletTypeInfo.PalletType;
+ }
+ return -1;
+ }
}
}
--
Gitblit v1.9.3