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/Api/Input_Entitys.cs | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 7 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs b/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
index 9ba6667..a492ca3 100644
--- a/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
+++ b/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
@@ -1,10 +1,10 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using Tiger.Model.Minsun;
namespace Tiger.Model
{
@@ -27,6 +27,14 @@
/// </summary>
public string SN { get; set; }
/// <summary>
+ /// 鏂欏彿
+ /// </summary>
+ public string ItemCode { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+ /// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
/// </summary>
public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
@@ -34,6 +42,41 @@
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
+ }
+
+
+ public class BaseInput<T> : BaseInput
+ {
+ public BaseInput()
+ {
+ }
+
+ public BaseInput(BaseInput input)
+ {
+ if (input != null)
+ {
+ AuthOption = input.AuthOption;
+ Locale = input.Locale;
+ Command = input.Command;
+ SN = input.SN;
+ ItemCode = input.ItemCode;
+ OrderNo = input.OrderNo;
+ Options = input.Options;
+ Data = JsonConvert.DeserializeObject<T>(input.Data);
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
+ /// </summary>
+ public new T Data { get; set; }
+ }
+
+ public class BaseInputWithPage : BaseInput
+ {
+ public int pageIndex { get; set; }
+ public int pageSize { get; set; }
+ public int total { get; set; }
}
public class BasePageInput
@@ -57,6 +100,49 @@
public string Code { get; set; }
}
+ /// <summary>
+ /// 澶囨枡鐗╂枡鎺ㄨ崘閫夐」
+ /// </summary>
+ public class SuggestOption
+ {
+ /// <summary>
+ /// 褰撳墠澶囨枡琛岀殑琛孖D
+ /// </summary>
+ public string LineID { get; set; }
+ /// <summary>
+ /// ERP浠撳簱缂栫爜
+ /// </summary>
+ public string ErpWH { get; set; }
+ /// <summary>
+ /// 浠撳簱ID
+ /// </summary>
+ public string WHID { get; set; }
+ /// <summary>
+ /// 鍌ㄥ尯ID
+ /// </summary>
+ public string RegionID { get; set; }
+ /// <summary>
+ /// 璐ф灦ID
+ /// </summary>
+ public string ShelfID { get; set; }
+ /// <summary>
+ /// 鍌ㄤ綅ID
+ /// </summary>
+ public string LocationID { get; set; }
+ /// <summary>
+ /// 鍙戞枡绛栫暐
+ /// </summary>
+ public WMS_ITEM_POOL.STRATEGYs Strategy { get; set; } = WMS_ITEM_POOL.STRATEGYs.FIFO;
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ /// </summary>
+ public WMS_ITEM_POOL.DLVY_MODEs DlvyMode { get; set; } = WMS_ITEM_POOL.DLVY_MODEs.Supply;
+ /// <summary>
+ /// 鏄惁瑕侀攣瀹氱墿鏂�
+ /// </summary>
+ public bool NeedLock { get; set; } = false;
+ }
+
public class OutOthDtlInput : BasePageInput
{
public bool IsItemCodeList { get; set; }
@@ -72,11 +158,6 @@
public string BatchNo { get; set; }
public double BatchQty { get; set; }
public List<RePrintLabelEntity> SnList { get; set; }=new List<RePrintLabelEntity>();
- }
-
- public class PrintSemiProdLabelEntity: RePrintLabelBase
- {
-
}
public class RePrintLabelEntity
--
Gitblit v1.9.3