一些更新

Ben Lin

2024-11-08 654e40dafb7cf02a0e0eb18f7c8c8927bbc7f770

一些更新

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -650,6 +650,11 @@
                }
                var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == wipList[0].WORK_ORDER).FirstAsync();
                result = WorkBatch.UnbindWipSnFromWO(wo, wipList, input.user);
                if (result.IsSuccessed)
                {
                    var newList = await Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.WORK_ORDER == wo.ORDER_NO && q.BATCH_NO == wipList[0].BATCH_NO && SqlFunc.IsNullOrEmpty(q.PARENT_SN) && q.QTY > 0).ToListAsync();
                    result.Data = newList;
                }
            }
            catch (Exception ex)
            {

 Tiger.Business.MES/Common/WorkBatch.cs

@@ -659,7 +659,7 @@
                    }
                }
                while (curpkg.Any());
                db.Updateable(curpkg, user).ExecuteCommand();
                db.Updateable(pkgs, user).ExecuteCommand();
                //MES_WIP_DFT，在上仓库装配和维修之前，先把不良记录标记为已处理
                db.Updateable<MES_WIP_DFT>(user)
                           .SetColumns(q => q.STATUS == MES_WIP_DFT.STATUSs.Resolved.GetValue())

 Tiger.Business.MES/LabelTemplate/BAS_LABEL_TEMP.cs

@@ -103,11 +103,16 @@
                {
                    //如果客户编码为空
                    prodTemp = input.Label;
                    if (ltemp != null && (ltemp.PROD_CODE.IsNullOrEmpty() || ltemp.PROD_CODE != input.Label.PROD_CODE))
                    if (ltemp != null && ltemp.PROD_CODE.IsNullOrEmpty() && ltemp.PROD_CODE != input.Label.PROD_CODE)
                    {
                        prodTemp.LABEL_CODE = GenerateCodeName(input.Label.LABEL_CODE, "_L");
                    }
                }
                var labelVarIds = input.LabelVars.Select(x => x.VAR_NAME).ToList();
                var labelVars = Biz.Db.Queryable<BAS_LABEL_VAR>()
                    .Where(q=> q.LABEL_ID == ltemp.ID)
                    .WhereIF(labelVarIds.Count>0, q=> !labelVarIds.Contains(q.VAR_NAME))
                    .ToList();
                var db = Biz.Db;
                var dbTran = db.UseTran(() =>
                {
@@ -131,6 +136,11 @@
                    x.LABEL_CODE == input.Label.LABEL_CODE &&
                    x.PROD_CODE == input.Label.PROD_CODE &&
                    x.CUST_CODE == input.Label.CUST_CODE).First();
                    //删除不在传入列表中的
                    if (labelVars.Count>0)
                    {
                        db.Deleteable(labelVars).ExecuteCommand();
                    }
                    if (input.LabelVars != null && input.LabelVars.Count > 0)
                    {
                        if (temp != null && temp.ID != input.LabelVars[0].LABEL_ID)
@@ -146,6 +156,10 @@
                        z.AsInsertable.ExecuteCommand();
                        z.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                    }
                    if (!input.LabelVars.Any())
                    {
                        db.Deleteable(labelVars).ExecuteCommand();
                    }
                    if (input.LabelVarWos != null && input.LabelVarWos.Count > 0)
                    {
                        if (temp != null && temp.ID != input.LabelVarWos[0].LABEL_ID)

 Tiger.Business.MES/Transaction/Position.cs

@@ -629,7 +629,7 @@
                                        var snList = _orderAction.CurPkg.Item.GetMinPackageList().Select(q => q.FLOW_SN).ToList();
                                        if (!snList.Any())
                                        {
                                            snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
                                            snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
                                        }
                                        _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
                                            .Where((q) => snList.Contains(q.FLOW_SN))