From fad1333a599e562c8fa7ee350852fee72b9a6a28 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 02 七月 2025 17:33:25 +0800
Subject: [PATCH] 出库任务取消在4之前不删除库存
---
wms/LocationHelper.cs | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 26c56bb..926ea92 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -307,6 +307,11 @@
bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
}
+ if (bindLocCntList.Count == 0)
+ {
+ LogHelper.Info($"宸茬粦瀹氾紝娌℃湁瑕佺粦瀹氱殑鏂板鍣紝{logs}");
+ return $"宸茬粦瀹氾紝娌℃湁瑕佺粦瀹氱殑鏂板鍣紝{logs}";
+ }
var log = JsonConvert.SerializeObject(bindLocCntList);
@@ -365,7 +370,6 @@
/// <summary>
/// 浜哄伐鎵嬪姩PDA瑙ｇ粦锛氬垹闄よ揣浣�瀹瑰櫒/璐у搧涓夋柟淇℃伅锛�=瑙ｇ粦璐т綅涓庡鍣紝2=瑙ｇ粦瀹瑰櫒涓庤揣鍝� /// </summary>
- /// <param name="model"></EmptyUnBind>
/// <returns></returns>
internal static SimpleResult PdaUnBind(PdaUnBindInfo model)
{
@@ -517,6 +521,11 @@
}
}
+ /// <summary>
+ /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂�+ /// </summary>
+ /// <param name="state"></param>
+ /// <returns></returns>
public static string GetStrByOk(int state)
{
if (state == 0)
@@ -530,6 +539,26 @@
if (state == 2)
{
return "涓嶅悎鏍�;
+ }
+ if (state == 3)
+ {
+ return "杩囨湡";
+ }
+ if (state == 4)
+ {
+ return "鎶�湳鍒ゅ畾";
+ }
+ if (state == 5)
+ {
+ return "娣峰悎";
+ }
+ if (state == 6)
+ {
+ return "涓�骇鏂�;
+ }
+ if (state == 7)
+ {
+ return "浜岀骇鏂�;
}
return "寰呮";
}
@@ -566,6 +595,7 @@
public string Spe { get; set; }//瑙勬牸
public string CarCode { get; set; }//杞﹀彿
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class ErrorLocCntResetInfo
@@ -580,11 +610,12 @@
public string rfId { get; set; }//瀹瑰櫒鍙�
/// <summary>
- /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝涓嬬嚎鍗冲緟妫�+ /// 0鍚堟牸1寰呮2涓嶅悎鏍硷紝3杩囨湡锛�鎶�湳鍒ゅ畾锛�娣峰悎锛�涓�骇鏂欍�7浜岀骇鏂� /// </summary>
public int cgState { get; set; }//鐗╂枡鐘舵�
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class ShowCntCountBySpeInfo
@@ -598,9 +629,8 @@
public class PDAReturnResetInfo
{
public string rfId { get; set; }//瀹瑰櫒鍙�-
public string startLoc { get; set; }//璧风偣璐т綅
-
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
}
--
Gitblit v1.9.1