From beca28ecb3a730ffb33c21e0c55c729774725faf Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 25 四月 2025 16:51:28 +0800
Subject: [PATCH] 优化备料单发料逻辑
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
index 9a754ea..51c6f40 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
@@ -30,9 +30,9 @@
[DisplayName("澶囨枡浠诲姟鍙�")]
public string ORDER_NO { get; set; }
/// <summary>
- /// 涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡)
+ /// 涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)
/// </summary>
- [DisplayName("涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡)")]
+ [DisplayName("涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)")]
public int BIZ_TYPE { get; set; }
/// <summary>
/// 鐘舵��(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
@@ -49,10 +49,40 @@
/// </summary>
[DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")]
public string SOURCE_ORDER { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [DisplayName("宸ュ巶缂栫爜")]
+ public string FTY_CODE { get; set; }
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ [DisplayName("杞﹂棿缂栫爜")]
+ public string WS_CODE { get; set; }
+ /// <summary>
+ /// 浜х嚎缂栫爜
+ /// </summary>
+ [DisplayName("浜х嚎缂栫爜")]
+ public string LINE_CODE { get; set; }
+ /// <summary>
+ /// 宀椾綅缂栫爜
+ /// </summary>
+ [DisplayName("宀椾綅缂栫爜")]
+ public string POST_CODE { get; set; }
+ /// <summary>
+ /// 宸ュ簭缂栫爜
+ /// </summary>
+ [DisplayName("宸ュ簭缂栫爜")]
+ public string OPER_CODE { get; set; }
+ /// <summary>
+ /// 鍔犲伐娈�
+ /// </summary>
+ [DisplayName("鍔犲伐娈�")]
+ public string SEGMENT { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
#endregion
@@ -61,8 +91,6 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- [SugarColumn(IsIgnore = true)]
- public BIZ_WMS_PREP_BTH CurBatch => Batchs?.OrderBy(q => q.CALL_TIME).FirstOrDefault(q => q.STATUS < STATUSs.Close.GetValue());
#endregion
#region 澶栭敭灞炴��
@@ -101,7 +129,7 @@
*/
/// <summary>
- /// 鏋氫妇锛氫笟鍔＄被鍨�(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡)
+ /// 鏋氫妇锛氫笟鍔＄被鍨�(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)
/// </summary>
public enum BIZ_TYPEs
{
@@ -111,9 +139,11 @@
Requisition = 1,
[Description("宸ュ崟澶囨枡")]
WorkOrder = 2,
- [Description("濮斿澶囨枡")]
- Outsourcing = 3,
- }
+ [Description("濮斿澶囨枡")]
+ Outsourcing = 3,
+ [Description("璋冩嫧澶囨枡")]
+ Transfer = 4,
+ }
/// <summary>
/// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
--
Gitblit v1.9.3