雅达-新增收货单处理和行审核功能

Ben Lin

2025-03-08 c267f7c90b46efa192bd3d790691118e521510c8

 Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs

@@ -20,24 +20,96 @@
        /// 实体：生产过程记录
        /// </summary>
        public MES_WIP_HIS() { }

        /// <summary>
        /// 实体：生产过程记录
        /// </summary>
        /// <param name="data">历史的来源Item</param>
        /// <param name="traceInfo">追溯信息</param>
        public MES_WIP_HIS(MES_WIP_DATA data, string traceInfo)
        {
            ID = Guid.NewGuid().ToString("N");
            CREATE_USER = data.CREATE_USER;
            UPDATE_USER = data.UPDATE_USER;
            AUTH_ORG = data.AUTH_ORG;
            AUTH_PROD = data.AUTH_PROD;
            AUTH_WH = data.AUTH_WH;
            WIP_ID = data.ID;
            SN = data.SN;
            STATUS = data.STATUS;
            ITEM_CODE = data.ITEM_CODE;
            QTY = data.QTY;
            WORK_ORDER = data.WORK_ORDER;
            BATCH_NO = data.BATCH_NO;
            ROT_CODE = data.ROT_CODE;
            NODE_ID = data.NODE_ID;
            NODE_NAME = data.NODE_NAME;
            FTY_CODE = data.FTY_CODE;
            WS_CODE = data.WS_CODE;
            LINE_CODE = data.LINE_CODE;
            POST_CODE = data.POST_CODE;
            OPER_CODE = data.OPER_CODE;
            SEGMENT = data.SEGMENT;
            HOLD_FLAG = data.HOLD_FLAG;
            REWORK_FLAG = data.REWORK_FLAG;
            UNBIND_FLAG = data.UNBIND_FLAG;
            FINISHED_FLAG = data.FINISHED_FLAG;
            DFT_FLAG = data.DFT_FLAG;
            DFT_COUNT = data.DFT_COUNT;
            DFT_CODE = data.DFT_CODE;
            REFLOW_NODE = data.REFLOW_NODE;
            FLOW_SN = data.FLOW_SN;
            TRAY_SN = data.TRAY_SN;
            INNER_SN = data.INNER_SN;
            CARTON_SN = data.CARTON_SN;
            PALLET_SN = data.PALLET_SN;
            INV_FLAG = data.INV_FLAG;
            INV_DATE = data.INV_DATE;
            INLINE_DATE = data.INLINE_DATE;
            OUTLINE_DATE = data.OUTLINE_DATE;
            OPERATION_TIME = data.OPERATION_TIME;
            OPERATION_END = data.OPERATION_END;
            DFT_QTY = data.DFT_QTY;
            SCRAP_QTY = data.SCRAP_QTY;
            SFTS_CODE = data.SFTS_CODE;
            SFT_CODE = data.SFT_CODE;
            PRD_CODE = data.PRD_CODE;
            OBA_STATUS = data.OBA_STATUS;
            OBA_BATCH = data.OBA_BATCH;
            LOCK_BATCH = data.LOCK_BATCH;
            SHIPPING_DATE = data.SHIPPING_DATE;
            SHIPPING_ORDER = data.SHIPPING_ORDER;
            REMARK = data.REMARK;
            TRACE_INFO = traceInfo;
        }
        #endregion

        #region 公共属性
        /// <summary>
        /// 在制品ID
        /// </summary>
        [DisplayName("在制品ID")]
        public string WIP_ID { get; set; }
        /// <summary>
        /// 过站条码
        /// </summary>
        [DisplayName("过站条码")]
        public string SN { get; set; }
        /// <summary>
        /// 状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
        /// 状态(0Init初始化|10Input已投入|20OK良品过站|30NG不良过站|40Repair维修中|50Output已产出|51WaitStorage待入库|52WaitShipment待出货|60InStorage已入库|61Reject已拒收|80Shipped已出货|90Scrap已报废|91Offline异常下线)
        /// </summary>
        [DisplayName("状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)")]
        [DisplayName("状态(0Init初始化|10Input已投入|20OK良品过站|30NG不良过站|40Repair维修中|50Output已产出|51WaitStorage待入库|52WaitShipment待出货|60InStorage已入库|61Reject已拒收|80Shipped已出货|90Scrap已报废|91Offline异常下线)")]
        public int STATUS { get; set; }
        /// <summary>
        /// 物料编码
        /// </summary>
        [DisplayName("物料编码")]
        public string ITEM_CODE { get; set; }
        /// <summary>
        /// 数量
        /// </summary>
        [DisplayName("数量")]
        public double QTY { get; set; } = 1;
        /// <summary>
        /// 工单号
        /// </summary>
@@ -49,20 +121,20 @@
        [DisplayName("工单批次号")]
        public string BATCH_NO { get; set; }
        /// <summary>
        /// 加工段
        /// 工艺路线编码
        /// </summary>
        [DisplayName("加工段")]
        public string SEGMENT { get; set; }
        /// <summary>
        /// 工艺路线ID
        /// </summary>
        [DisplayName("工艺路线ID")]
        public string ROT_ID { get; set; }
        [DisplayName("工艺路线编码")]
        public string ROT_CODE { get; set; }
        /// <summary>
        /// 工艺路线节点ID
        /// </summary>
        [DisplayName("工艺路线节点ID")]
        public string NODE_ID { get; set; }
        /// <summary>
        /// 工艺路线节点名称
        /// </summary>
        [DisplayName("工艺路线节点名称")]
        public string NODE_NAME { get; set; }
        /// <summary>
        /// 工厂编码
        /// </summary>
@@ -89,6 +161,11 @@
        [DisplayName("工序编码")]
        public string OPER_CODE { get; set; }
        /// <summary>
        /// 加工段
        /// </summary>
        [DisplayName("加工段")]
        public string SEGMENT { get; set; }
        /// <summary>
        /// 锁定标记
        /// </summary>
        [DisplayName("锁定标记")]
@@ -99,20 +176,50 @@
        [DisplayName("返工标记")]
        public string REWORK_FLAG { get; set; }
        /// <summary>
        /// 解绑标记(因异常下线导致当前记录从工单生产数据中移除，不参与工艺流程计算和数据统计)
        /// </summary>
        [DisplayName("解绑标记(因异常下线导致当前记录从工单生产数据中移除，不参与工艺流程计算和数据统计)")]
        public string UNBIND_FLAG { get; set; }
        /// <summary>
        /// 是否完工
        /// </summary>
        [DisplayName("是否完工")]
        public string FINISHED_FLAG { get; set; }
        /// <summary>
        /// 是否不良
        /// </summary>
        [DisplayName("是否不良")]
        public string DFT_FLAG { get; set; }
        /// <summary>
        /// 不良计数
        /// </summary>
        [DisplayName("不良计数")]
        public int DFT_COUNT { get; set; }
        /// <summary>
        /// 不良代码编码
        /// </summary>
        [DisplayName("不良代码编码")]
        public string DFT_CODE { get; set; }
        /// <summary>
        /// 维修回流工序名称(为空则不指定回流工序)
        /// </summary>
        [DisplayName("维修回流工序名称(为空则不指定回流工序)")]
        public string REFLOW_NODE { get; set; }
        /// <summary>
        /// 厂内流转条码
        /// </summary>
        [DisplayName("厂内流转条码")]
        public string FLOW_SN { get; set; }
        /// <summary>
        /// 托盘/载具条码
        /// </summary>
        [DisplayName("托盘/载具条码")]
        public string TRAY_SN { get; set; }
        /// <summary>
        /// 容器/内包装条码
        /// 内包装条码
        /// </summary>
        [DisplayName("容器/内包装条码")]
        public string CONTAINER_SN { get; set; }
        [DisplayName("内包装条码")]
        public string INNER_SN { get; set; }
        /// <summary>
        /// 外箱条码
        /// </summary>
@@ -148,6 +255,21 @@
        /// </summary>
        [DisplayName("当前操作时间")]
        public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
        /// <summary>
      /// 操作完成时间
      /// </summary>
      [DisplayName("操作完成时间")]
        public DateTime OPERATION_END { get; set; } = DateTime.MinValue;
        /// <summary>
        /// 不良数量
        /// </summary>
        [DisplayName("不良数量")]
        public int DFT_QTY { get; set; } = 0;
        /// <summary>
        /// 报废数量
        /// </summary>
        [DisplayName("报废数量")]
        public int SCRAP_QTY { get; set; } = 0;
        /// <summary>
        /// 班制编码
        /// </summary>
@@ -194,6 +316,11 @@
        [DisplayName("备注")]
        public string REMARK { get; set; }
        /// <summary>
      /// 操作耗时(s)
      /// </summary>
      [DisplayName("操作耗时(ms)")]
        public long ELAPSED_TIME { get; set; } = 0;
        /// <summary>
        /// 追溯信息
        /// </summary>
        [DisplayName("追溯信息")]
@@ -205,6 +332,11 @@
      [SugarColumn(IsIgnore = true)]
      public string FieldName { get; set; }
      */
        /// <summary>
        /// 是否已经良品过站
        /// </summary>
        [SugarColumn(IsIgnore = true)]
        public bool IsFinished => DFT_FLAG != "Y";
        #endregion

        #region 外键属性
@@ -233,7 +365,7 @@
      */

        /// <summary>
        /// 枚举：状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
        /// 枚举：状态(0Init初始化|10Input已投入|20OK良品过站|30NG不良过站|40Repair维修中|50Output已产出|51WaitStorage待入库|52WaitShipment待出货|60InStorage已入库|61Reject已拒收|80Shipped已出货|90Scrap已报废|91Offline异常下线)
        /// </summary>
        public enum STATUSs
        {
@@ -249,14 +381,16 @@
            Repair = 4,
            [Description("已完工")]
            Finished = 5,
            [Description("已报废")]
            Scrap = 6,
            [Description("已入库")]
            InStorage = 7,
            InStorage = 6,
            [Description("已拒收")]
            Reject = 8,
            Reject = 7,
            [Description("已出货")]
            Shipped = 9,
            Shipped = 8,
            [Description("异常下线")]
            Offline = 9,
            [Description("已报废")]
            Scrap = 10,
        }

        /// <summary>