重打更新

Ben Lin

2024-11-07 5fbbfd1593ea09c4126f03c7520bf317de50f1bb

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -501,7 +501,7 @@
                    }
                }
                //入库标签
                var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStroe").First();
                var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStore").First();
                if (!wipActInStore.IsNullOrEmpty())
                {
                    var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipActInStore.ACT_VALUE_3);
@@ -518,7 +518,7 @@
                    string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
                    foreach (var pkg in pkgList)
                    {
                        var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStroe").First();
                        var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStore").First();
                        if (!actSn.IsNullOrEmpty())
                        {
                            actSn.ACT_VALUE_3 = ACT_VALUE_3;
@@ -555,7 +555,8 @@
            try
            {
                //先查出工单条码中是否存在
                var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)).FirstAsync();
                var outerSn = input.Code.Split('|')[0];
                var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code) || q.OUTER_SN == outerSn).FirstAsync();
                if (woSn == null)
                {
                    result.IsSuccessed = false;
@@ -578,11 +579,15 @@
                //如果查不到就去行为日志查
                if (labelPrint.IsNullOrEmpty() && input.ReqType == 1)
                {
                    printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => (q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
                    printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN.Equals(woSn.OUTER_SN) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
                }
                else if (labelPrint.IsNullOrEmpty() && input.ReqType == 2)
                {
                    printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN.Equals(woSn.SN) && q.ACT_VALUE_4 == "InStore").First()?.ACT_VALUE_3 ?? "";
                }
                else
                {
                    printParam = labelPrint.PRINT_PARAM;
                    printParam = labelPrint?.PRINT_PARAM ?? "";
                }
                result.Data = printParam;
                result.LocaleMsg = new($"重打条码[{input.Code}]的标签成功");
@@ -635,11 +640,13 @@
            var result = new ApiAction();
            try
            {
                var wipList = await Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN.Equals(input.SN) || q.FLOW_SN.Equals(input.SN) || q.CARTON_SN == input.SN).ToListAsync();
                var cartonSn = input.SN.Split('|')[0];
                var wipList = await Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN.Equals(input.SN) || q.FLOW_SN.Equals(input.SN) || q.CARTON_SN == cartonSn).ToListAsync();
                if (wipList.Count == 0)
                {
                    result.IsSuccessed = false;
                    result.LocaleMsg = new($"解绑的条码不存在当前操作表中！");
                    return result;
                }
                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);