WMS增加标准上下架功能事务

Rodney Chen

2024-12-19 eb0ad83719de660e5c4f7676aea4710625b6bd51

 Tiger.Business.MES/WorkAction/YadaAssembly.cs

@@ -162,9 +162,9 @@
                    //根据条码规则验证上料是否正确
                    if (!item.RuleCode.IsNullOrEmpty())
                    {
                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
                        if (!Cache.CodeRule[item.RuleCode].IsNullOrEmpty())
                        {
                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                            var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
                            if (!result.IsSuccessed)
                            {
                                isOK = false;
@@ -190,9 +190,9 @@
                        {
                            if (!subItem.RULE_CODE.IsNullOrEmpty())
                            {
                                if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
                                if (!Cache.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
                                {
                                    var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                                    var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
                                    //只要有一个替代料通过验证则可以上料
                                    if (result.IsSuccessed)
                                    {
@@ -205,16 +205,16 @@
                        }
                    }
                    //如果当前物料存在备料表中存在推荐批次，则上料物料必须属于其推荐批次的物料
                    var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
                    if (isOK && suggest.Any())
                    {
                        isOK = false;
                        //在推荐批次所属工单的条码中存在
                        if (MainDB.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
                        {
                            isOK = true;
                        }
                    }
                    //var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
                    //if (isOK && suggest.Any())
                    //{
                    //    isOK = false;
                    //    //在推荐批次所属工单的条码中存在
                    //    if (MainDB.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
                    //    {
                    //        isOK = true;
                    //    }
                    //}
                    //验证通过则保存上料信息
                    if (isOK)
                    {