增加字段

Rodney Chen

2024-09-04 ae9e999b7305d8934b9fd1c95d0cf0ca87c31fd1

增加字段

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -279,6 +279,7 @@
                                WORK_ORDER = CurBatch.Batch.ORDER_NO,
                                WIP_ID = wipSN.ID,
                                SN = wipSN.SN,
                                FLOW_SN = wipSN.SN,
                                TRAY_SN = wipSN.TRAY_SN,
                                STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                            });

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -311,6 +311,7 @@
                                WORK_ORDER = CurBatch.Batch.ORDER_NO,
                                WIP_ID = wipSN.ID,
                                SN = wipSN.SN,
                                FLOW_SN = wipSN.SN,
                                TRAY_SN = wipSN.TRAY_SN,
                                STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                            });

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -279,6 +279,7 @@
                                WORK_ORDER = CurBatch.Batch.ORDER_NO,
                                WIP_ID = wipSN.ID,
                                SN = wipSN.SN,
                                FLOW_SN = wipSN.SN,
                                TRAY_SN = wipSN.TRAY_SN,
                                STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                            });

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -67,7 +67,9 @@
            //只允许单个产品进行客户条码绑定
            if (CurPosition.CurWipSNs.Count > 1)
            {
                action.Data.ShortMsg = new("请扫描产品", ShortMessage.Types.Error);
                CurStep.Message = Biz.L("请扫描单个产品");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("请扫描单个产品", ShortMessage.Types.Error);
                //action.LocaleMsg = new($"条码[{0}]是包装/载具条码，请重新扫描单个厂内条码进行客户条码绑定");
                action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotProductSN", CurPosition.CurSN);
                //重置工序操作
@@ -104,7 +106,9 @@
                        NeedScan = true,
                        Label = "",
                    };
                    action.Data.ShortMsg = new("扫描客户标签", ShortMessage.Types.Normal);
                    CurStep.Message = Biz.L("扫描客户标签");
                    CurStep.Status = StepStatus.Normal;
                    action.Data.ShortMsg = new("扫描客户标签", ShortMessage.Types.Normal);
                    //action.LocaleMsg = new Locale($"请扫描厂内条码[{0}]需要绑定客户条码");
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.BeginScan", wipSn.SN);
                }
@@ -118,7 +122,9 @@
                        NeedScan = true,
                        Label,
                    };
                    action.Data.ShortMsg = new("扫描已打印的客户标签", ShortMessage.Types.Normal);
                    CurStep.Message = Biz.L("扫描已打印的客户标签");
                    CurStep.Status = StepStatus.Normal;
                    action.Data.ShortMsg = new("扫描已打印的客户标签", ShortMessage.Types.Normal);
                    //action.LocaleMsg = new Locale($"开始打印厂内条码[{0}]对应的客户条码");
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.BeginPrint", wipSn.SN);
                }
@@ -147,6 +153,8 @@
            //客户条码已绑定其他厂内条码
            if (!CurCSN.FLOW_SN.IsNullOrEmpty() && CurCSN.FLOW_SN != CurPosition.CurWipSNs.First().SN)
            {
                CurStep.Message = Biz.L("绑定失败");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("绑定失败", ShortMessage.Types.Failed);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"厂内条码[{0}]绑定客户条码[{1}]失败，客户条码已绑定厂内条码[{2}]");
@@ -160,6 +168,8 @@
            //客户条码不属于当前工单的客户
            else if (CurCSN.CUST_CODE.IsNullOrEmpty(CurPosition.WorkBatch.WO.CUST_CODE) != CurPosition.WorkBatch.WO.CUST_CODE)
            {
                CurStep.Message = Biz.L("绑定失败");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("绑定失败", ShortMessage.Types.Failed);
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"客户条码[{0}]属于客户[{1}]，与当前工单的客户[{2}]不一致");
@@ -247,6 +257,7 @@
            };

            IsFinished = true;
            CurStep.Message = Biz.L("客户条码已绑定");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("客户条码已绑定", ShortMessage.Types.Success);
            //action.LocaleMsg = new($"厂内条码[{0}]已绑定客户条码[{1}]完成", Label.LABEL_NAME);

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

@@ -39,10 +39,15 @@
        [DisplayName("在制品ID")]
        public string WIP_ID { get; set; }
        /// <summary>
        /// 条码
        /// 当前条码
        /// </summary>
        [DisplayName("条码")]
        [DisplayName("当前条码")]
        public string SN { get; set; }
        /// <summary>
        /// 厂内流转条码
        /// </summary>
        [DisplayName("厂内流转条码")]
        public string FLOW_SN { get; set; }
        /// <summary>
        /// 托盘/载具条码
        /// </summary>
@@ -54,9 +59,9 @@
        [DisplayName("最外层包装条码")]
        public string OUTER_SN { get; set; }
        /// <summary>
        /// 物料编码
        /// </summary>
        [DisplayName("物料编码")]
        /// 物料编码
        /// </summary>
        [DisplayName("物料编码")]
        public string ITEM_CODE { get; set; }
        /// <summary>
        /// 状态(0NotInput未投入|1Inputed已投入|2Finished已完工)