优化和修正打印逻辑及字段命名

Ben Lin

2025-01-02 7a1496993b3ecae726bbbdb2f16508c8906cde8b

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -20,6 +20,7 @@
using Tiger.Model.MES.Yada;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
using Tiger.Model.Minsun;
using Tiger.Model.Entitys.MES.U9C;

namespace Tiger.Business.MES
{
@@ -131,20 +132,30 @@
                    return result;
                }
                var batchs = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).ToListAsync();
                if ((batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
                if (batchs.Count > 0)
                {
                    result.IsSuccessed = false;
                    result.LocaleMsg = new($"工单下发的数量超过工单计划数量，不能下发！");
                    return result;
                }
                var _batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()).First();
                if (_batch != null)
                {
                    result.IsSuccessed = false;
                    result.LocaleMsg = new($"工单[{input.Wo.ORDER_NO}]已经存在工单批次[{_batch.BATCH_NO}]在线体[{input.WoBatch.ACT_LINE}]中状态为[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]，不能下发！");
                    return result;
                    if ((batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
                    {
                        result.IsSuccessed = false;
                        result.LocaleMsg = new($"工单下发的数量超过工单计划数量，不能下发！");
                        return result;
                    }
                    if (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
                    {
                        result.IsSuccessed = false;
                        result.LocaleMsg = new($"工单[{input.Wo.ORDER_NO}]已经有批次存在线体[{input.WoBatch.ACT_LINE}]中，而且状态不为关闭，不能下发！");
                        return result;
                    }
                    if (batchs.Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue() && SqlFunc.DateIsSame(x.PLAN_DATE, DateTime.Now)))
                    {
                        result.IsSuccessed = false;
                        result.LocaleMsg = new($"工单[{input.Wo.ORDER_NO}]已经有批次存在计划日期相同，而且状态为[初始化]，请转到工单批次中下发！");
                        return result;
                    }
                }
                //WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
                input.WoBatch.PLAN_DATE = DateTime.Now;
                input.Wo.PLAN_DATE = (input.Wo.PLAN_DATE ?? "") + ((input.Wo.PLAN_DATE ?? "").Contains(input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")) ? "" : $",{input.WoBatch.PLAN_DATE.ToString("yyyy-MM-dd")}");
                input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
                input.Wo.RELEASE_TIME = DateTime.Now;
                input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
@@ -166,7 +177,7 @@
                       .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                       .ToStorage();
                    y.AsInsertable.ExecuteCommand();
                    y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                    y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.STATUS, q.PLAN_DATE, q.ACT_LINE, q.RELEASE_TIME, q.RELEASE_USER, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();

                    db.Insertable(input.WoBatch).ExecuteCommand();
                });
@@ -270,8 +281,8 @@
                var _woBatch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.BATCH_NO == input.WoBatch).FirstAsync();
                if (_woBatch != null)
                {
                    _woBatch.CHANGE_TIME = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()? DateTime.Now: _woBatch.CHANGE_TIME;
                    _woBatch.CHANGE_USER = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() ? input.UserId: _woBatch.CHANGE_USER;
                    _woBatch.CHANGE_TIME = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() ? DateTime.Now : _woBatch.CHANGE_TIME;
                    _woBatch.CHANGE_USER = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() ? input.UserId : _woBatch.CHANGE_USER;
                    _woBatch.STATUS = input.Status < 0 ? _woBatch.STATUS : input.Status;
                    if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
                    {
@@ -314,7 +325,7 @@
                    //如果是下发
                    if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
                    {
                        db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER,x.CHANGE_TIME }).ExecuteCommand();
                        db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
                    }
                    else
                    {
@@ -373,7 +384,7 @@
                var db = Biz.Db;
                var dbTran = db.UseTran(() =>
                {
                    Expression<Func<BAS_LABEL_VAR_WO, object>> predicate = !input.WORK_ORDER.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW } : 
                    Expression<Func<BAS_LABEL_VAR_WO, object>> predicate = !input.WORK_ORDER.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW } :
                    !input.PROD_CODE.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.PROD_CODE, t.VAR_NAME, t.GHOST_ROW } : t => new { t.LABEL_ID, t.VAR_NAME, t.GHOST_ROW };
                    var y = db.Storageable(input)
                       .WhereColumns(predicate)
@@ -481,7 +492,7 @@
            var result = new ApiAction();
            try
            {
                var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q=>q.SN == code || q.FLOW_SN == code || q.OUTER_SN == code).FirstAsync();
                var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN == code || q.FLOW_SN == code || q.OUTER_SN == code).FirstAsync();
                if (woSn == null)
                {
                    result.IsSuccessed = false;
@@ -581,7 +592,7 @@
                    result.LocaleMsg = new($"条码不存在！");
                    return result;
                }
                var woNode = await Biz.Db.Queryable<MES_WO_NODE>().Where(q => q.WORK_ORDER.Equals(woSn.WORK_ORDER) && q.OPER_CODE== "SpecPackingNode").FirstAsync();
                var woNode = await Biz.Db.Queryable<MES_WO_NODE>().Where(q => q.WORK_ORDER.Equals(woSn.WORK_ORDER) && q.OPER_CODE == "SpecPackingNode").FirstAsync();
                if (woNode == null)
                {
                    result.IsSuccessed = false;
@@ -630,24 +641,26 @@
                DbClient db = Biz.DataSource["YadaU9C"].Client;
                var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q => q.ORG_CODE == input.orgCode).FirstAsync();
                string wo = input.wo;
                if (!input.SN.IsNullOrEmpty() && input.wo.IsNullOrEmpty()) {
                if (!input.SN.IsNullOrEmpty() && input.wo.IsNullOrEmpty())
                {
                    var woSn = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN).First();
                    if (!woSn.IsNullOrEmpty()) {
                    if (!woSn.IsNullOrEmpty())
                    {
                        wo = woSn.WORK_ORDER;
                    }
                }
                var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2 ).First();
                var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2).First();
                if (!ship.IsNullOrEmpty())
                {
                    result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
                    {
                        ShipDoc = ship.ShipDoc,
                        ShippingQty = ship.ShipQty,
                        ShippingQty = ship.ShipQty.ToDouble(),
                        Tag = "Customer"
                    } : new()
                    {
                        ShipDoc = ship.ShipDoc,
                        ShippingQty = ship.ShipQty,
                        ShippingQty = ship.ShipQty.ToDouble(),
                        Tag = "InStoreLabel"
                    };
                    result.LocaleMsg = new($"出货信息存在！");
@@ -722,7 +735,7 @@
                    result.LocaleMsg = new($"条码不存在！");
                    return result;
                }
                var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER ).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q._ItemInfos).FirstAsync();
                var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == woSns[0].WORK_ORDER).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q._ItemInfos).FirstAsync();
                if (wo == null)
                {
                    result.IsSuccessed = false;
@@ -732,8 +745,10 @@
                //判断工单是否已经全部入库


                InStoreInfo inStoreInfo = new() {
                    ErpProdInBth= new() { 
                InStoreInfo inStoreInfo = new()
                {
                    ErpProdInBth = new()
                    {
                        WORK_ORDER = wo.ORDER_NO,
                        BATCH_NO = woSns[0].BATCH_NO,
                        SALES_ORDER = wo.SALES_ORDER,
@@ -743,7 +758,8 @@
                        SCAN_QTY = woSns.Count,
                        IS_HANDLED = "N" //Y-已生成，N-未生成，F-失败
                    },
                    InStoreScanInfo = new() { 
                    InStoreScanInfo = new()
                    {
                        SN = cartonSn,
                        SALES_ORDER = wo.SALES_ORDER,
                        WORK_ORDER = wo.ORDER_NO,
@@ -761,6 +777,98 @@
            return result;
        }

        /// <summary>
        /// 获取工单备料信息
        /// </summary>
        /// <param name="code"></param>
        /// <returns></returns>
        public async Task<ApiAction<List<WoFlowCardPrintJson>>> GetWoPickList(string code)
        {
            var action = new ApiAction<List<WoFlowCardPrintJson>>($"成功", new List<WoFlowCardPrintJson>());
            try
            {
                DbClient db = Biz.DataSource["YadaU9C"].Client;
                var moPickLists = db.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == code).OrderBy(q => q.DocLineNO).ToList();
                var ids = moPickLists.Select(x => SqlFunc.ToString(x.ItemMaster)).ToList();
                var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => ids.Contains(q.ID)).IncludesAllFirstLayer().ToList();
                var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == code).IncludesAllFirstLayer().FirstAsync();
                SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = code });
                var routeList = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_WO_PTREE>("SP_MES_GET_WO_PTREE", pars);//返回List
                var routeStr = string.Join("->", routeList.Where(q => q.type == "Node" && q.name != "完工").OrderBy(x=>x.seq).Select(q=>q.name).ToList());
                List<WoFlowCardPrintJson> woFlowCardPrintJson = new();
                //生成打印实体
                int i = 1;
                string Model = moPickLists.Where(q => q.IssueStyleName == "推式").First()?.ItemModel;
                string MoRemark = moPickLists[0]?.MoRemark;
                string SoRemark = moPickLists[0]?.SoRemark;
                string Customer = moPickLists[0]?.Customer;
                string DemandCode = moPickLists[0]?.DemandCode;
                WoFlowCardPrintJson printJson = new()
                {
                    ID = Guid.NewGuid().ToString("N"),
                    OrderNo = code,
                    Status = wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetDesc(),
                    Model = Model,
                    ItemCode = wo.ITEM_CODE,
                    ItemDesc = wo.ItemInfo?.ITEM_DESC,
                    SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
                    Qty = wo.PLAN_QTY,
                    SoRemark = wo.SALES_REMARK,
                    MoRemark= MoRemark,
                    Customer = Customer,
                    DemandCode= DemandCode,
                    RouteStr = routeStr,
                    Items = new() { }
                };
                foreach (var item in moPickLists)
                {
                    PrintWoPickList list = new()
                    {
                        LineNo = item.DocLineNO,
                        SapCode = item.SapCode,
                        ItemCode = item.Code,
                        ItemDesc = items.Where(q => q.ID == SqlFunc.ToString(item.ItemMaster)).FirstOrDefault()?.ITEM_DESC,
                        PickQty = item.ActualReqQty,
                        LineRemark = item.Remark,
                        WhCode = item.InventoryInfoCode,
                        WhCode07 = item.PictureCode,
                        Method = item.IssueStyleName,
                    };
                    printJson.Items.Add(list);
                    if (i % 11 == 0)
                    {
                        woFlowCardPrintJson.Add(printJson);
                        printJson = new()
                        {
                            ID = Guid.NewGuid().ToString("N"),
                            OrderNo = code,
                            ItemCode = wo.ITEM_CODE,
                            ItemDesc = wo.ItemInfo?.ITEM_DESC,
                            SapCode = wo.ItemInfo?.ExtInfo?.SapCode,
                            Qty = wo.PLAN_QTY,
                            Model = Model,
                            MoRemark = MoRemark,
                            Customer = Customer,
                            DemandCode = DemandCode,
                            RouteStr = routeStr,
                            Items = new() { }
                        };
                    }
                    i++;
                }
                if (printJson.Items.Count > 0 )
                {
                    woFlowCardPrintJson.Add(printJson);
                }
                action.Data = woFlowCardPrintJson;
            }
            catch (Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"获取工单{code}备料信息异常");
            }
            return action;
        }

        #region 提交前通用方法
        /// <summary>
        /// 提交前检查是否岗位、工单和不良代码