合并

Rodney Chen

2024-08-26 d811e775f550e65f4af420806e3d7a12c0c334bc

 Tiger.Business.MES/WorkAction/ThreeInOne.cs

@@ -84,8 +84,13 @@
            {
                CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
                CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;

                End();
                action.Data.Data = new
                {
                    NeedPrint = false,
                    NeedScan = false,
                    Label = "",
                };
                action = End();
            }
            //厂内条码未绑定客户条码
            else
@@ -96,7 +101,8 @@
                   action.Data.Data = new
                   {
                       NeedPrint = false,
                       Label = "",
                        NeedScan = true,
                        Label = "",
                   };
                   action.Data.ShortMsg = new("扫描客户标签", ShortMessage.Types.Normal);
                    //action.LocaleMsg = new Locale($"请扫描厂内条码[{0}]需要绑定客户条码");
@@ -109,9 +115,10 @@
                   action.Data.Data = new
                   {
                       NeedPrint = true,
                       Label,
                        NeedScan = true,
                        Label,
                   };
                   action.Data.ShortMsg = new("打印客户标签", ShortMessage.Types.Normal);
                   action.Data.ShortMsg = new("扫描已打印的客户标签", ShortMessage.Types.Normal);
                    //action.LocaleMsg = new Locale($"开始打印厂内条码[{0}]对应的客户条码");
                    action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.BeginPrint", wipSn.SN);
                }