一些更改

Ben Lin

2024-10-29 83d595aad854a42d6b28f8651ee7ef774dfd4e04

 Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs

@@ -25,6 +25,7 @@
        #endregion
        public BAS_LABEL_TEMP Label { get; set; }
        public List<BAS_LABEL_PV> LabelPV { get; set; }
        public WipPkg CurPkg { get; set; }
        public bool NoNeedInStorePrint { get; set; }
        #endregion Propertys & Variables

@@ -67,6 +68,7 @@
        public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());
            CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null;

            if (Label.IsNullOrEmpty())
            {
@@ -76,14 +78,14 @@
            {
               //设置打印变量值
               Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
               if (CurPosition.Context.ContainsKey("CurPackage"))
               if (!CurPkg.IsNullOrEmpty())
               {
                    (CurPosition.Context["CurPackage"] as WipPkg).InStoreActID = NodeAct.ID;
                    (CurPosition.Context["CurPackage"] as WipPkg).InStoreLabel = Label;
                    CurPkg.InStoreActID = NodeAct.ID;
                    CurPkg.InStoreLabel = Label;
               }
   
               //判断是否需要打印入库标签
               NoNeedInStorePrint = (!CurPosition.Context.ContainsKey("CurPackage") || !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished) 
               NoNeedInStorePrint = (CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished) 
                                       || (CurPosition is YadaPacking && (CurPosition as YadaPacking).IsPrintCustomerLabel);
               if (NoNeedInStorePrint)
               {
@@ -140,7 +142,6 @@
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            var CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null;
            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            foreach (var wipSn in CurPosition.CurWipSNs)