From 9ec715d2deb18a269dd49c48da91a36632d08c81 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 18 六月 2025 00:56:26 +0800
Subject: [PATCH] 最新代码上传，优化功能等
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index a4d38c2..4759255 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -76,6 +76,10 @@
{
Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == warehouseId);
if (locationInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒板綋鍓嶅簱鍖鸿揣浣嶄俊鎭�");
+ if (stationCode!= "8005")
+ {
+ return WebResponseContent.Instance.Error($"璧风偣閿欒锛歿stationCode}");
+ }
return DeviceRequestInboundTask(stationCode, locationInfo.RoadwayNo, palletCode);
}
else
@@ -765,22 +769,30 @@
{
return content.Error($"鎵樼洏绫诲瀷淇℃伅涓嶅瓨鍦�");
}
- //鑾峰彇闃荤剨鎵规
- WebResponseContent requestLotInfo = GetZHMesMaterialLot(materialLot);
- if (!requestLotInfo.Status)
+ ////鑾峰彇闃荤剨鎵规
+ //WebResponseContent requestLotInfo = GetZHMesMaterialLot(materialLot);
+ //if (!requestLotInfo.Status)
+ //{
+ // return content.Error($"璇锋眰闃荤剨鎵规淇℃伅澶辫触,{requestLotInfo.Message}");
+ //}
+ //MesLotInfoModel mesLotInfo = JsonConvert.DeserializeObject<MesLotInfoModel>(requestLotInfo.Data.ToString());
+ MesLotInfoModel mesLotInfo = new MesLotInfoModel()
{
- return content.Error($"璇锋眰闃荤剨鎵规淇℃伅澶辫触,{requestLotInfo.Message}");
- }
- MesLotInfoModel mesLotInfo = JsonConvert.DeserializeObject<MesLotInfoModel>(requestLotInfo.Data.ToString());
+ Product="FH001",
+ ProductVersion="A1",
+ Qty=20,
+ LotNo= materialLot,
+ IsFullNumber=true
+ };
Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
{
MaterielSpec = mesLotInfo.ProductVersion,
BatchNo = materialLot,
- EffectiveDate = mesLotInfo.DateCode ?? "",
+ EffectiveDate = mesLotInfo.DateCode ?? " ",
MaterielCode = mesLotInfo.Product,
InboundOrderRowNo = 0,
MaterielName = mesLotInfo.Product,
- ProductionDate = mesLotInfo.DateCode ?? "",
+ ProductionDate = mesLotInfo.DateCode ?? " ",
OrderNo = "",
OutboundQuantity = 0,
SerialNumber = materialLot,
@@ -820,7 +832,7 @@
//BaseDal.AddData(task);
_unitOfWorkManage.CommitTran();
//灏嗕换鍔℃帹閫佸埌WCS
- PushTasksToWCS(new List<Dt_Task>() { taskIn }, "AGV_ZH"); ;
+ PushTasksToWCS(new List<Dt_Task>() { taskIn }, "AGV_ZH", agvTaskCode);
content.OK(data: taskIn);
}
catch (Exception ex)
--
Gitblit v1.9.3