From f398a14e78be869dbe96746bada7be3fc2b0b223 Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期一, 23 六月 2025 17:47:24 +0800
Subject: [PATCH] 杭氧
---
HH.WCS.Mobox3.HangYang/process/TaskProcess.cs | 138 +++++++++++++++++++++++++++++++++-------------
1 files changed, 99 insertions(+), 39 deletions(-)
diff --git a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
index ea37f3b..1ef67ec 100644
--- a/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3.HangYang/process/TaskProcess.cs
@@ -385,44 +385,25 @@
{
if (model == null)
{
- result.errMsg = "鍏ュ簱鍗曚笉鍙负绌哄�锛�;
+ result.errMsg = "鐗╂枡涓绘暟鎹笉鍙负绌哄�锛�;
return result;
}
+ var materialList = new List<TN_Material>();
- //foreach (var item in model.InOrderDetail)
- //{
- // var itemType = WMSHelper.GetItemType(item.S_ITEM_CODE);
- // if (itemType == null)
- // {
- // result.errMsg = $"鏈煡璇㈠埌鐗╂枡{item.S_ITEM_CODE}鐨勭墿鏂欏睘鎬э紒";
- // return result;
- // }
- // item.S_EXT_ATTR1 = itemType.S_ITEM_TYPE;
- //}
-
- //var groupedInOrders = model.InOrderDetail
- // .GroupBy(detail => detail.S_EXT_ATTR1) // 鎸夌墿鏂欏睘鎬у垎缁�- // .Select((group, index) => new InOrder
- // {
- // S_NO = $"{model.S_BS_NO}_{index + 1}", // 鎷兼帴鏉ユ簮鍗曞彿
- // S_BS_NO = model.S_BS_NO,
- // S_OP_TYPE = model.S_OP_TYPE,
- // S_BS_TYPE = model.S_BS_TYPE,
- // S_NOTE = model.S_NOTE,
- // InOrderDetail = group.Select(detail =>
- // {
- // // 淇敼 group 涓殑 S_IO_NO 瀛楁涓�S_NO 鐨勫�
- // detail.S_IO_NO = $"{model.S_BS_NO}_{index + 1}";
- // detail.S_BS_NO = model.S_BS_NO;
- // return detail;
- // }).ToList() // 鍒嗙粍鍚庣殑鏄庣粏
- // })
- // .ToList();
- //var res = WMSHelper.CreateOrderIn(groupedInOrders);
- //if (res)
- //{
- // result.success = true;
- //}
+ foreach (var item in model)
+ {
+ materialList.Add(new TN_Material
+ {
+ S_ITEM_CODE = item.S_ITEM_CODE,
+ S_ITEM_NAME = item.S_ITEM_NAME,
+ S_ITEM_TYPE = item.S_AREA_CODE,
+ S_ITEM_SPEC = item.S_MATERIAL_SPEC,
+ S_MATERIAL = item.S_MATERIAL,
+ S_UOM = item.S_UOM,
+ C_CLEAN = item.C_CLEAN,
+ });
+ }
+ WMSHelper.CreateMaterialData(materialList);
return result;
}
catch (Exception ex)
@@ -433,7 +414,7 @@
var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
if (frame != null)
{
- LogHelper.Error($"GetInboundOrder鍏ュ簱鍗曟柊澧炲嚭鐜伴敊璇紒锛�, ex);
+ LogHelper.Error($"GetMaterialData鐗╂枡涓绘暟鎹柊澧炲嚭鐜伴敊璇紒锛�, ex);
LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
@@ -444,7 +425,7 @@
}
/// <summary>
- /// 鍏ュ簱鍗曟柊澧�+ /// 鍏ュ簱鍗曟柊澧炰互鍙婁慨鏀� /// </summary>
/// <param name="model">鍏ュ簱鍗�/param>
/// <returns></returns>
@@ -518,9 +499,9 @@
}
/// <summary>
- /// 鍑哄簱鍗曟柊澧�+ /// 鍑哄簱鍗曟柊澧炰互鍙婁慨鏀� /// </summary>
- /// <param name="model">鍏ュ簱鍗�/param>
+ /// <param name="model">鍑哄簱鍗�/param>
/// <returns></returns>
public static Result GetOutboundOrder(OutOrder model)
{
@@ -600,6 +581,85 @@
}
}
+ /// <summary>
+ /// 鍏ュ簱鍗曞彇娑�+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗�/param>
+ /// <returns></returns>
+ public static Result CancelInboundOrder(InOrder model)
+ {
+ Result result = new Result() { success = false, };
+ try
+ {
+ if (model == null || !model.OrderDetail.Any())
+ {
+ result.errMsg = "鍏ュ簱鍗曞彇娑堜笉鍙负绌哄�锛�;
+ return result;
+ }
+ var res = WMSHelper.CancelOrderIn(model);
+ if (res)
+ {
+ result.success = true;
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.success = false;
+ result.errMsg = ex.Message;
+ var st = new System.Diagnostics.StackTrace(ex, true);
+ var frame = st.GetFrame(0); // 鑾峰彇绗竴涓爢鏍堝抚
+ if (frame != null)
+ {
+ LogHelper.Error($"CancelInboundOrder鍏ュ簱鍗曞彇娑堝嚭鐜伴敊璇紒锛�, ex);
+ LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
+ LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
+ LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
+ }
+ return result;
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄簱鍗曞彇娑�+ /// </summary>
+ /// <param name="model">鍑哄簱鍗�/param>
+ /// <returns></returns>
+ public static Result CancelOutboundOrder(OutOrder model)
+ {
+ Result result = new Result() { success = false };
+ try
+ {
+ if (model == null || !model.OrderDetail.Any())
+ {
+ result.errMsg = "鍑哄簱鍗曚笉鍙负绌哄�锛�;
+ return result;
+ }
+ var res = WMSHelper.CancelOrderOut(model);
+ if (res)
+ {
+ result.success = true;
+ }
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.success = false;
+ result.errMsg = ex.Message;
+ var st = new System.Diagnostics.StackTrace(ex, true);
+ var frame = st.GetFrame(0);
+ if (frame != null)
+ {
+ LogHelper.Error($"CancelOutboundOrder鍑哄簱鍗曞彇娑堝嚭鐜伴敊璇紒", ex);
+ LogHelper.Error($"鏂囦欢鍚� {frame.GetFileName()}", ex);
+ LogHelper.Error($"琛屽彿: {frame.GetFileLineNumber()}", ex);
+ LogHelper.Error($"鍒楀彿: {frame.GetFileColumnNumber()}", ex);
+ }
+ return result;
+ }
+ }
+
+
///// <summary>
///// 鑾峰彇浣滀笟鍒涘缓鍏ュ簱浠诲姟
///// </summary>
--
Gitblit v1.9.1