From aec5896a7a92e2c2fe1811acbb41e6c3a656706b Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期三, 26 三月 2025 14:42:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs | 153 +++++++-------------------------------------------
1 files changed, 22 insertions(+), 131 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
index 28b5662..57dca25 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
@@ -7,152 +7,52 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：备料单(WMS)
+ /// 实体：备料任务(WMS)
/// </summary>
[Description("Primary:ID")]
- [DisplayName("备料单(WMS)")]
+ [DisplayName("备料任务(WMS)")]
[Serializable]
[SugarTable("BIZ_WMS_PREP")]
public class BIZ_WMS_PREP : DbEntityWithAuth
{
#region 构造函数
/// <summary>
- /// 实体：备料单(WMS)
+ /// 实体：备料任务(WMS)
/// </summary>
public BIZ_WMS_PREP() {}
#endregion
#region 公共属性
/// <summary>
- /// 备料单号
+ /// 备料任务号
/// </summary>
- [DisplayName("备料单号")]
+ [DisplayName("备料任务号")]
public string ORDER_NO { get; set; }
/// <summary>
- /// 类型(0Supply正常备料|1First首套备料)
+ /// 业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料)
/// </summary>
- [DisplayName("类型(0Supply正常备料|1First首套备料)")]
- public int PREP_TYPE { get; set; }
- /// <summary>
- /// 发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)
- /// </summary>
- [DisplayName("发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)")]
- public int DLVY_MODE { get; set; }
+ [DisplayName("业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料)")]
+ public int BIZ_TYPE { get; set; }
/// <summary>
/// 状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)
/// </summary>
[DisplayName("状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)")]
public int STATUS { get; set; }
/// <summary>
- /// 来源单据编码，多个用“'”分隔
+ /// 来源单据编码，多个用“,”分隔
/// </summary>
- [DisplayName("来源单据编码，多个用“'”分隔")]
+ [DisplayName("来源单据编码，多个用“,”分隔")]
public string SOURCE_CODE { get; set; }
/// <summary>
- /// 来源单号，多个用“'”分隔，跟编码一一对应
+ /// 来源单号，多个用“,”分隔，跟编码一一对应
/// </summary>
- [DisplayName("来源单号，多个用“'”分隔，跟编码一一对应")]
+ [DisplayName("来源单号，多个用“,”分隔，跟编码一一对应")]
public string SOURCE_ORDER { get; set; }
- /// <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 DateTime CALL_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 计划完成时间
- /// </summary>
- [DisplayName("计划完成时间")]
- public DateTime PLAN_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 备料优先级(1-7)越小越优先
- /// </summary>
- [DisplayName("备料优先级(1-7)越小越优先")]
- public int PRIORITY { get; set; }
- /// <summary>
- /// 备料人
- /// </summary>
- [DisplayName("备料人")]
- public string PREP_PERSON { get; set; }
- /// <summary>
- /// 备料完成时间
- /// </summary>
- [DisplayName("备料完成时间")]
- public DateTime FINISH_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 领料人
- /// </summary>
- [DisplayName("领料人")]
- public string REQ_PERSON { get; set; }
- /// <summary>
- /// 领料部门
- /// </summary>
- [DisplayName("领料部门")]
- public string REQ_DEPT { get; set; }
- /// <summary>
- /// 出库时间
- /// </summary>
- [DisplayName("出库时间")]
- public DateTime DLVY_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 关联领料单号
- /// </summary>
- [DisplayName("关联领料单号")]
- public string REQ_ORDER { get; set; }
/// <summary>
/// 备注
/// </summary>
[DisplayName("备注")]
public string REMARK { get; set; }
- /// <summary>
- /// -1:未处理，0:同步处理完，>0:同步处理失败次数
- /// </summary>
- [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
- public int HANDLED { get; set; } = -1;
- /// <summary>
- /// 最后一次同步处理日期
- /// </summary>
- [DisplayName("最后一次同步处理日期")]
- public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 过账提交的JSON
- /// </summary>
- [DisplayName("过账提交的JSON")]
- public string COMMIT_JSON { get; set; }
- /// <summary>
- /// 过账提交的返回信息
- /// </summary>
- [DisplayName("过账提交的返回信息")]
- public string COMMIT_MSG { get; set; }
#endregion
#region 虚拟属性
@@ -188,27 +88,18 @@
*/
/// <summary>
- /// 枚举：类型(0Supply正常备料|1First首套备料)
+ /// 枚举：业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料)
/// </summary>
- public enum PREP_TYPEs
+ public enum BIZ_TYPEs
{
- [Description("正常备料")]
- Supply = 0,
- [Description("首套备料")]
- First = 1,
- }
-
- /// <summary>
- /// 枚举：发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)
- /// </summary>
- public enum DLVY_MODEs
- {
- [Description("整单发料")]
- Whole = 0,
- [Description("A面发料")]
- SideA = 1,
- [Description("B面发料")]
- SideB = 2,
+ [Description("其他备料")]
+ Others = 0,
+ [Description("领料单备料")]
+ Requisition = 1,
+ [Description("工单备料")]
+ WorkOrder = 2,
+ [Description("委外备料")]
+ Outsourcing = 3,
}
/// <summary>
--
Gitblit v1.9.3