工单变量优化

Ben Lin

2024-10-17 6984f73c06b8d5ab5da41e16b4ac68dc87716a16

 Tiger.Business.MES/Transaction/Position.cs

@@ -552,11 +552,15 @@
                                case "GetSN":
                                    return CurSN;
                                case "GetBAS_ITEM":
                                    return WorkBatch.Product.CUST_PROD_CODE;
                                    return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
                                case "GetItemName":
                                    return WorkBatch.Product.ITEM_NAME;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
                                case "GetCustomer":
                                    return WorkBatch.Batch.Customer.ToJson();
                                    return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
                                case "GetSalesOrder":
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
                                case "GetPackNumber":
                                    return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
                                case "GetBoxQR":
                                    return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
                                case "GetCardQR":
@@ -570,13 +574,13 @@
                                    }
                                    return string.Join("\r\n", minPkgList);
                                case "GetDescription":
                                    return WorkBatch.Product.ITEM_DESC;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
                                case "GetFengZ":
                                    return WorkBatch.Product.ExtInfo.Packaging;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
                                case "GetPAndO":
                                    return WorkBatch.WO.SALES_CONTRACT;
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
                                case "GetLTD":
                                    return WorkBatch.WO.Customer?.CUST_NAME_CN;
                                    return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
                                case "GetHWDate":
                                    List<string> list = new List<string>();
                                    var _action = action is PackingAction ? action as PackingAction : null;
@@ -622,7 +626,7 @@
                                    }
                                    return "";
                                case "GetNOTES":
                                    return WorkBatch.Product.ExtInfo?.Remark;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark); 
                                case "GetXH":
                                    return GetCardCode(lvars);
                                case "GetCardNo":
@@ -630,9 +634,9 @@
                                case "GetCardTotal":
                                    return "";
                                case "GetModelSpec": //Model+空格+SPEC,
                                    return $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}";
                                    return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
                                case "GetDATE":
                                    return $"{DateTime.Now.ToString("yyyy/MM/dd")}";
                                    return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
                                default:
                                    return "";
                            }
@@ -695,7 +699,7 @@
            }
            else
            {
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
            }
            return result;
        }
@@ -758,13 +762,13 @@
            var itemCode = action.CurPkg.CustSN?.ITEM_CODE;
            var weight = action.CurPkg.WeightInfo.Weight;
            var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
            var model = WorkBatch.Product.ExtInfo.Model;
            var Input = WorkBatch.Product.ExtInfo.Input;
            var OutPut = WorkBatch.Product.ExtInfo.OutPut;
            var Power = WorkBatch.Product.ExtInfo.Power;
            var Accuracy = WorkBatch.Product.ExtInfo.Accuracy;
            var Display = WorkBatch.Product.ExtInfo.Display;
            var Remark = WorkBatch.Product.ExtInfo.Remark;
            var model = WorkBatch.Product.ExtInfo?.Model;
            var Input = WorkBatch.Product.ExtInfo?.Input;
            var OutPut = WorkBatch.Product.ExtInfo?.OutPut;
            var Power = WorkBatch.Product.ExtInfo?.Power;
            var Accuracy = WorkBatch.Product.ExtInfo?.Accuracy;
            var Display = WorkBatch.Product.ExtInfo?.Display;
            var Remark = WorkBatch.Product.ExtInfo?.Remark;

            return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|型号:{model},输入:{Input},显示:{Display},输出:{OutPut},电源:{Power},精度:{Accuracy},备注:{Remark}";
        }