一些已知更改

Ben Lin

2024-10-14 34eeea4ca710586b23f76ceff2f5ab3b644630e7

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -393,13 +393,24 @@
                    result.LocaleMsg = new($"模板不存在！");
                    return result;
                }
                var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
                var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => q.WORK_ORDER.Equals(input.WorkOrder) && q.LABEL_ID.Equals(labeltemp.ID));
                var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
                && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
                && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
                && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
                var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
                    .Where(q => q.LABEL_ID.Equals(labeltemp.ID))
                    .WhereIF(!input.WorkOrder.IsNullOrEmpty(), q => q.WORK_ORDER.Equals(input.WorkOrder))
                    .WhereIF(!input.ProdCode.IsNullOrEmpty(), q=>q.PROD_CODE.Equals(input.ProdCode))
                    .WhereIF(!input.CustCode.IsNullOrEmpty(), q => q.PROD_CODE.Equals(input.CustCode));
                query.page = await queryable.ToPageAsync(input.pageIndex, input.pageSize);
                //如果不存在，则返回初始数据
                if (query.page.totals == 0)
                {
                    query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToPageAsync(input.pageIndex, input.pageSize);
                    query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
                     && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
                     && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
                     && q.LABEL_ID.Equals(labeltemp.ID))
                     .ToPageAsync(input.pageIndex, input.pageSize);
                    query.Items = query.page.data;
                }
                //如果初始变量数大于工单设置的变量数