From 2e5f13ec5bbb47ec3462ee8060d9484691808ae1 Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期五, 04 七月 2025 18:53:05 +0800 Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi --- HH.WCS.QingXiNongfu/wms/WCSModel.cs | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs index 7ab6f7a..7ce11e3 100644 --- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs +++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs @@ -271,7 +271,12 @@ /// </summary> public int WorkType { get; internal set; } = 0; public string MidArea { get; internal set; } - public string TagOver { get; internal set; } + + /// <summary> + /// 寮冪敤锛�鏀逛负璁板綍涓婃搴撳尯- + /// </summary> + public string TagOver { get; internal set; } = ""; + public DateTime? TagOverTime { get; internal set; } public string S_BQ_TRAY_TYPE { get; internal set; } = ""; /// <summary> @@ -499,12 +504,24 @@ [SuGG("搴撳簱杞繍")] public class YWLZXtake : BaseModel { + public string SQL_WorkNo { get; set; } public string S_START_AREA { get; set; } public int N_START_ROW { get; set; } + public int N_END_ROW { get; set; } public string S_ZZ_AREA { get; set; } public string S_END_AREA { get; set; } public string S_ZX_STATE { get; set; } + /// <summary> + /// 缂栫爜 鍚嶇О 鍘傚锛�鏈潵涓嶉渶瑕侊紝 涓轰簡ab鍖轰笉瓒虫椂锛岃Е鍙戣浆杩愩� 闃叉閲嶅鐗╂枡鍗曟嵁 + /// </summary> + public string S_ITEM_CODE { get; set; } + public string S_ITEM_NAME { get; set; } + /// <summary> + /// 鍘傚 + /// </summary> + public string S_CJ_NAME { get; set; } + } [SuGG("绉诲簱宸ュ崟琛�)] -- Gitblit v1.9.1