From 5ab19c977cfb0551a88b3885b0648183fbfff672 Mon Sep 17 00:00:00 2001
From: libo <Administrator@DESKTOP-1A6QMNS>
Date: 星期一, 31 三月 2025 10:10:12 +0800
Subject: [PATCH] 调整wms出入库、返库逻辑，调整与比亚迪接口对接的类型和方法，调整配置参数，写入服务器上数据库密码
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
index 67ee1f5..58ddd4e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs"
@@ -14,6 +14,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.LogHelper;
using WIDESEA_Core.Utilities;
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
@@ -53,81 +54,120 @@
WebResponseContent content = new WebResponseContent();
try
{
+
+ //Logger.Write_Log("System/test", "", "2.0 ", "");
+
materielGroupDTO.OrderNo = GetOrderNo();
+ //Logger.Write_Log("System/test", "", "2.1 ", "");
Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(materielGroupDTO.PalletCode);
+
+ //Logger.Write_Log("System/test", "", "2.2 ", "");
(bool, string, object?) result = CheckMaterielGroupParam(materielGroupDTO, stockInfo);
if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
if (stockInfo == null)
{
+ //Logger.Write_Log("System/test", "", "2.2.1 ", "");
stockInfo = new Dt_StockInfo();
stockInfo.PalletCode = materielGroupDTO.PalletCode;
stockInfo.StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt();
stockInfo.Creater = "绔嬪簱WMS";
stockInfo.Details = new List<Dt_StockInfoDetail>();
-
+
}
+
+ //Logger.Write_Log("System/test", "", "2.3 ", "");
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
List<Dt_LabelMaster> notExistLabels = new List<Dt_LabelMaster>();
foreach (var lablel in materielGroupDTO.SerialNumbers)
{
Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel);
- if(labmaster == null)
+ if (labmaster == null)
{
+
+ //Logger.Write_Log("System/test", "", "2.3.1 lablel=" + lablel);
//閫氳繃鏉＄爜鎺ュ彛鍚屾鏉＄爜涓绘暟鎹�
- var res= _sys_JobService.GetLabMaster(lablel);
+ var res = _sys_JobService.GetLabMaster(lablel);
if (res != null && res.Status)
{
+ //Logger.Write_Log("System/test", "", "2.3.2 res.Status=" + res.Status.ToString());
labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == lablel);
if (labmaster == null)
{
+ //Logger.Write_Log("System/test", "", "2.3.3 ", "");
notExistLabels.Add(labmaster);
}
}
else
{
- return content = WebResponseContent.Instance.Error("缁勭洏鏉＄爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!");
- }
- }
- if(labmaster!=null)
+
+ //Logger.Write_Log("System/test", "", "2.3.4 ", "");
+ return content = WebResponseContent.Instance.Error("缁勭洏鏉＄爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!");
+ }
+ }
+ if (labmaster != null)
{
+ //Logger.Write_Log("System/test", "", "2.3.5 ", "");
//涓绘暟鎹潯鐮佺姸鎬佸厑璁哥粍鐩橈細01宸叉敹鏂欏緟璐ㄦ锛�02宸叉敹鏂欐棤闇�璐ㄦ锛�03寰呰繘浠撳凡璐ㄦ锛�09宸蹭笅鏋讹紱
//涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏锛�00鍒涘缓锛�04宸茶川妫�寰呴��璐э紝05鏀舵枡鎴块��璐э紝06搴撴埧閫�璐э紝07宸茶繘浠擄紝08宸蹭笂鏋讹紝10宸插嚭搴擄紝11宸插喕缁擄紝12宸查攣瀹氾紝20鍏抽棴鐨勶紱
- if (labmaster.LABEL_STATUS=="00"|| labmaster.LABEL_STATUS == "04" || labmaster.LABEL_STATUS == "05"|| labmaster.LABEL_STATUS == "06" || labmaster.LABEL_STATUS == "07" || labmaster.LABEL_STATUS == "08" || labmaster.LABEL_STATUS == "10" || labmaster.LABEL_STATUS == "11" || labmaster.LABEL_STATUS == "12" || labmaster.LABEL_STATUS == "20")
+ if (labmaster.LABEL_STATUS == "00" || labmaster.LABEL_STATUS == "04" || labmaster.LABEL_STATUS == "05" || labmaster.LABEL_STATUS == "06" || labmaster.LABEL_STATUS == "07" || labmaster.LABEL_STATUS == "08" || labmaster.LABEL_STATUS == "10" || labmaster.LABEL_STATUS == "11" || labmaster.LABEL_STATUS == "12" || labmaster.LABEL_STATUS == "20")
{
- return content = WebResponseContent.Instance.Error("涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏!鏉＄爜鐘舵�侊細"+ labmaster.LABEL_STATUS);
+
+ //Logger.Write_Log("System/test", "", "2.3.6 LABEL_STATUS=" + labmaster.LABEL_STATUS);
+ return content = WebResponseContent.Instance.Error("涓绘暟鎹潯鐮佺姸鎬佷笉鍏佽缁勭洏!鏉＄爜鐘舵�侊細" + labmaster.LABEL_STATUS);
}
}
}
+
+ //Logger.Write_Log("System/test", "", "2.4 ", "");
+
if (notExistLabels.Count == 0)
{
+
+ //Logger.Write_Log("System/test", "", "2.4.1 ", "");
foreach (var item in materielGroupDTO.SerialNumbers)
{
+
+ //Logger.Write_Log("System/test", "", "2.4.2 "+ item);
+ //Logger.Write_Log("System/test", "", "2.4.2.0 ", "");
Dt_LabelMaster labmaster = _labelMasterRepository.QueryFirst(x => x.LABEL_NO == item);
+
Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail();
dt_StockInfoDetail.Status = 0;
+
+ //Logger.Write_Log("System/test", "", "2.4.2.1 ", "");
dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo;
dt_StockInfoDetail.StockId = stockInfo.Id != 0 ? stockInfo.Id : 0;
dt_StockInfoDetail.MaterielCode = labmaster.MATNR;
dt_StockInfoDetail.MaterielName = labmaster.MAKTX;
dt_StockInfoDetail.BatchNo = labmaster.BATCH;
dt_StockInfoDetail.SerialNumber = labmaster.LABEL_NO;
- dt_StockInfoDetail.StockQuantity = int.Parse(labmaster.BOX_QTY);
+ //Logger.Write_Log("System/test", "", "2.4.2.2 "+ labmaster.BOX_QTY);
+ dt_StockInfoDetail.StockQuantity = (int)Convert.ToDouble(labmaster.BOX_QTY);
dt_StockInfoDetail.OutboundQuantity = 0;
dt_StockInfoDetail.Creater = "System";
+
+ //Logger.Write_Log("System/test", "", "2.4.2.3 ", "");
stockInfoDetails.Add(dt_StockInfoDetail);
- stockInfo.Details.AddRange(stockInfoDetails);
+
+ //Logger.Write_Log("System/test", "", "2.4.2.4 ", "");
+ stockInfo.Details.AddRange(stockInfoDetails);
+
+ //Logger.Write_Log("System/test", "", "2.4.2.5 ", "");
}
content = MaterielGroupUpdateData(stockInfo);
}
else
{
+
+ //Logger.Write_Log("System/test", "", "2.4.3 ", "");
content = WebResponseContent.Instance.Error("缁勭洏鏉＄爜鍦ㄤ笂娓竁MS绯荤粺涓笉瀛樺湪!");
- }
+ }
}
catch (Exception ex)
{
+ //Logger.Write_Log("System/test", "", "2.4.4 " + ex.ToString());
content = WebResponseContent.Instance.Error(ex.Message);
}
finally
@@ -164,7 +204,7 @@
foreach (var item in inventoryRequest.DATA)
{
-
+
Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail();
dt_StockInfoDetail.Status = 0;
dt_StockInfoDetail.OrderNo = materielGroupDTO.OrderNo;
@@ -173,7 +213,7 @@
dt_StockInfoDetail.MaterielName = "";
dt_StockInfoDetail.BatchNo = "";
dt_StockInfoDetail.SerialNumber = item.LABEL_NO;
- dt_StockInfoDetail.StockQuantity = int.Parse(item.QTY);
+ dt_StockInfoDetail.StockQuantity = (int)Convert.ToDouble(item.QTY);
dt_StockInfoDetail.OutboundQuantity = 0;
dt_StockInfoDetail.Creater = "WMS";
stockInfoDetails.Add(dt_StockInfoDetail);
@@ -205,12 +245,12 @@
new LogFactory().GetLog("WMS鎺ュ彛").InfoFormat(true, "returnInventory", "浣欐枡閫�鍥炰俊鎭�", $"{inventoryRequeststr}");
ReturnInventoryRequest inventoryRequest = JsonConvert.DeserializeObject<ReturnInventoryRequest>(inventoryRequeststr);
- ReturnInventoryResponse response= new ReturnInventoryResponse();
+ ReturnInventoryResponse response = new ReturnInventoryResponse();
MaterielGroupDTO materielGroupDTO = new MaterielGroupDTO();
materielGroupDTO.PalletCode = inventoryRequest.TPNUM;
materielGroupDTO.OrderNo = inventoryRequest.IZLID; //閫�璐у叆搴撴寚浠�
List<string> SerialNumbers = new List<string>();
- Dt_MainReturnInventory dt_MainReturnInventoryOld = _mainReturnInventoryRepository.QueryFirst(x => x.RETURN_NO == inventoryRequest.RETURN_NO && x.RETURN_ITEM_NO == inventoryRequest.RETURN_ITEM_NO);
+ Dt_MainReturnInventory dt_MainReturnInventoryOld = _mainReturnInventoryRepository.QueryFirst(x => x.RETURN_NO == inventoryRequest.RETURN_NO && x.RETURN_ITEM_NO == inventoryRequest.RETURN_ITEM_NO);
if (dt_MainReturnInventoryOld == null)
{
//淇濆瓨鍥為��鏁版嵁鍒版湰鍦�
@@ -289,9 +329,9 @@
try
{
Dt_StockInfo? stockInfo = _stockService.StockInfoService.GetStockByPalletCode(PalletCode);
- if(stockInfo != null)
+ if (stockInfo != null)
{
- if(stockInfo.StockStatus!= (int)StockStatusEmun.缁勭洏鏆傚瓨)
+ if (stockInfo.StockStatus != (int)StockStatusEmun.缁勭洏鏆傚瓨)
{
return content = WebResponseContent.Instance.Error("缁勭洏鏆傚瓨鐘舵�佹墠鍙互鎾ら攢缁勭洏锛�");
}
@@ -305,12 +345,12 @@
}
content = MaterielGroupUpdateData(stockInfo);
- }
+ }
else
{
return content = WebResponseContent.Instance.Error("缁勭洏淇℃伅涓嶅瓨鍦紒");
}
-
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3