From 8953f14db850deaf66782197a5d2bff35fe41e1a Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期三, 02 七月 2025 18:02:09 +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 | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/WCSModel.cs b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
index fbc1113..7ce11e3 100644
--- a/HH.WCS.QingXiNongfu/wms/WCSModel.cs
+++ b/HH.WCS.QingXiNongfu/wms/WCSModel.cs
@@ -2,10 +2,6 @@
using HH.WCS.QingXigongchang.util;
using SqlSugar;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace HH.WCS.QingXigongchang.wms
{
@@ -195,7 +191,9 @@
}
}
-
+ /// <summary>
+ /// 鍘熺墿鏂欏伐鍗曡〃
+ /// </summary>
[SuGG("鍘熺墿鏂欏伐鍗曡〃")]
public class YWLWorkOrder : BaseModel
{
@@ -273,9 +271,39 @@
/// </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>
+ /// 鍘傚
+ /// </summary>
+ public string S_CJ_NAME { get; set; }
+ }
+
+ [SuGG("鍘傚鏃堕棿琛�)]
+ public class CjTimeOrder : BaseModel
+ {
+ /// <summary>
+ /// 鍘傚鍚嶇О
+ /// </summary>
+ public string S_CJ_NAME { get; set; }
+ /// <summary>
+ /// 鍘傚鏃堕棿
+ /// </summary>
+ public DateTime T_CJ_TIME { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string S_ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string S_ITEM_NAME { get; set; }
}
[SuGG("鐡剁洊宸ュ崟琛�)]
@@ -474,13 +502,25 @@
/// 鍘熺墿鏂欑焊绠辫浆杩愮Щ搴撱�
/// </summary>
[SuGG("搴撳簱杞繍")]
- public class YWLZXtake: BaseModel
+ public class YWLZXtake : BaseModel
{
- public string S_START_AREA { get; set; }
- public int N_START_ROW { get; set; }
- public string S_ZZ_AREA { get; set; }
- public string S_END_AREA { get; set; }
- public string S_ZX_STATE { get; set; }
+ 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; }
}
--
Gitblit v1.9.1