Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

2024-10-18 54d77af16404853acc0a977c9185f50ee22c2bbf

Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -420,6 +420,7 @@
                    {
                        if (queryable.ToList().Any(q => q.VAR_NAME == item.VAR_NAME))
                        {
                            item.ID = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.ID;
                            item.WORK_ORDER = input.WorkOrder;
                            item.VAR_VALUE = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.VAR_VALUE;
                        }

 Tiger.Business.MES/Transaction/Position.cs

@@ -552,15 +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 WorkBatch.WO.SALES_ORDER;
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
                                case "GetPackNumber":
                                    return WorkBatch.WO.ORDER_NO;
                                    return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
                                case "GetBoxQR":
                                    return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
                                case "GetCardQR":
@@ -574,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;
@@ -626,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":
@@ -634,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 "";
                            }
@@ -699,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;
        }

 Tiger.Business/MES/Biz.Route.cs

@@ -521,9 +521,9 @@
                            expableOper.And(x => x.ROT_ID == item.ID);
                        }
                    }

                    expable.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
                    expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
                    string _custCode = input.custCode ?? "";
                    expable.And(x => x.PROD_CODE == input.prodCode && (x.CUST_CODE == _custCode));
                    expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == _custCode);

                    var exp = expable.ToExpression();
                    var expOper = expableOper.ToExpression();