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

Rodney Chen

2024-11-12 48d7d2be65597d31274461daadfd2360424e28b5

 Tiger.Business/MES/Biz.Route.cs

@@ -508,12 +508,12 @@
                {
                    var expable = Expressionable.Create<MES_PROD_ACTION>();
                    var expableOper = Expressionable.Create<MES_PROD_OPER>();
                    if (!string.IsNullOrEmpty(input.rotId))
                    if (!input.rotId.IsNullOrEmpty())
                    {
                        expable.And(x => x.ROT_ID == input.rotId);
                        expableOper.And(x => x.ROT_ID == input.rotId);
                    }
                    else if (!string.IsNullOrEmpty(input.rotCode))
                    else if (!input.rotCode.IsNullOrEmpty())
                    {
                        var item = await Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == input.rotCode).FirstAsync();
                        if (item != null)
@@ -522,17 +522,32 @@
                            expableOper.And(x => x.ROT_ID == item.ID);
                        }
                    }
                    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);
                    if (!input.prodCode.IsNullOrEmpty())
                    {
                        expable.And(x => x.PROD_CODE == input.prodCode );
                        expableOper.And(x => x.PROD_CODE == input.prodCode);
                    }
                    if (!input.custCode.IsNullOrEmpty())
                    {
                        expable.And(x => x.CUST_CODE == input.custCode);
                        expableOper.And(x => x.CUST_CODE == input.custCode);
                    }

                    var exp = expable.ToExpression();
                    var expOper = expableOper.ToExpression();
                    var db = Db;
                    var dbTran = db.UseTran(() =>
                    {
                        if (!input.prodCode.IsNullOrEmpty())
                        {
                        db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
                        db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
                        }
                        if (input.prodCode.IsNullOrEmpty() && !input.custCode.IsNullOrEmpty())
                        {
                            db.Updateable<MES_PROD_ACTION>().SetColumns(x => x.CUST_CODE == "").Where(exp).ExecuteCommand();
                            db.Updateable<MES_PROD_OPER>().SetColumns(x => x.CUST_CODE == "").Where(expOper).ExecuteCommand();
                        }
                    });
                    if (!dbTran.IsSuccess)
                    {