完善单容器多物料场景的优化重构, 优化ERP回报信息的处理

kazelee

4 天以前 fbb7c2253c86d58583d7e3b0a8a44d0342c43c73

 api/DebugController.cs

@@ -4,13 +4,15 @@
using System.Web.Http;

using HH.WCS.Mobox3.AnGang.dispatch;
using HH.WCS.Mobox3.AnGang.wms;
using HH.WCS.Mobox3.AnGang.models;
using HH.WCS.Mobox3.AnGang.util;
using HH.WCS.Mobox3.AnGang.wms;

using Newtonsoft.Json;

using SqlSugar;

using static HH.WCS.Mobox3.AnGang.api.ApiModel;
using HH.WCS.Mobox3.AnGang.util;

namespace HH.WCS.Mobox3.AnGang.api {
    /// <summary>
@@ -106,147 +108,26 @@
        /// <returns></returns>
        [HttpPost]
        [Route("CreateDatabase")]
        public string CreateDatabase(CoverInfo model) {
        public string CreateDatabase() {
            try {
                var db = new SqlHelper<object>().GetInstance();
                var cover = model.IsCover;

                var entityTypes = new Type[] {
                    typeof(TN_CAR_IN),
                    typeof(TN_CG_Detail),
                    typeof(TN_Container),
                    typeof(TN_Loc_Container),
                    typeof(TN_Location),
                    typeof(TN_Task),
                    typeof(TN_Task_Action),
                    typeof(SYSHelper.OI_SYS_MAXID),
                var entityTypes = new Type[] { };

                };

                using (var tran = db.Ado.UseTran()) {
                    if (cover) {
                        // 删除所有表（按依赖关系倒序）
                        var tables = db.DbMaintenance.GetTableInfoList();
                        foreach (var table in tables.OrderByDescending(t => t.Name)) {
                            db.DbMaintenance.DropTable(table.Name);
                        }

                        // 创建新表
                        db.CodeFirst.InitTables(entityTypes);

                        //db.CodeFirst.BackupTable().InitTables(entityTypes);
                    }
                    else {
                        db.CodeFirst.InitTables(entityTypes);
                    }

                    tran.CommitTran();
                }

                //db.CodeFirst.InitTables(entityTypes);
            }
            catch (Exception ex) {
                LogHelper.Info($"发生了异常");
                return "初始化数据库错误" + ex.Message;
            }

            return "成功";
        }

        /// <summary>
        /// DEBUG：插入货位、容器、货品信息
        /// DEBUG：根据任务号设置物料重量
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("InsertLocCntrCg")]
        public string InsertLocCntrCg(LocCntrCg locCntrCg) {
            var db = new SqlHelper<object>().GetInstance();

            try {
                using (var tran = db.UseTran()) {
                    LogHelper.Info("LogCntrCg：" + JsonConvert.SerializeObject(locCntrCg));
                    if (string.IsNullOrEmpty(locCntrCg.LocCode)) {
                        return "参数非法";
                    }

                    var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
                    if (loc == null) {
                        var newLoc = new TN_Location {
                            S_CODE = locCntrCg.LocCode,
                            S_AREA_CODE = locCntrCg.LocArea ?? ""
                        };

                        if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入位置{locCntrCg.LocCode}失败");
                            return "插入失败";
                        }

                        loc = newLoc;
                    }

                    //if (loc.N_CURRENT_NUM == 0) {
                    //    loc.N_CURRENT_NUM = 1;
                    //    if (db.Updateable<TN_Location>(loc).UpdateColumns(
                    //        it => new { it.N_CURRENT_NUM, it.T_MODIFY }).ExecuteCommand() <= 0) {
                    //        tran.RollbackTran();
                    //        LogHelper.Info($"修改位置{locCntrCg.LocCode}失败");
                    //        continue;
                    //    }
                    //}

                    if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
                        tran.CommitTran();
                        LogHelper.Info("容器号为空，不再读取后面的数据");
                        return "容器号为空，不再读取后面的数据";
                    }

                    var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
                        && a.S_CNTR_CODE == locCntrCg.CntrCode);

                    if (locCntrRel == null) {
                        var newLocCntrRel = new TN_Loc_Container {
                            S_LOC_CODE = locCntrCg.LocCode,
                            S_CNTR_CODE = locCntrCg.CntrCode
                        };

                        loc.N_CURRENT_NUM = 1;

                        if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
                            && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入位置托盘关系{locCntrCg.LocCode}-{locCntrCg.CntrCode}失败");
                            return "插入失败";
                        }
                    }

                    if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
                        tran.CommitTran();
                        LogHelper.Info("物料号为空，不再读取后面的数据");
                        return "物料号为空，不再读取后面的数据";
                    }

                    var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
                        && a.S_ITEM_CODE == locCntrCg.ItemCode);
                    if (cgDetail == null) {
                        var locList = new List<TN_CG_Detail>();
                        locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
                        if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"插入托盘物料关系{locCntrCg.CntrCode}-{locCntrCg}失败");
                            return "插入失败";
                        }
                    }
                    tran.CommitTran();
                }

                return "插入数据成功";

            }
            catch (Exception ex) {
                return $"{ex.Message}";
            }
        }

        [HttpPost]
        [Route("SetTaskWeight")]
        public string SetTaskWeight(SetTaskWeightInfo model) {
@@ -258,21 +139,103 @@
                return "找不到对应的物料信息";
            }

            cgDetail.F_QTY = model.Weight;
            var task = db.Queryable<TN_Task>()
                .Where(t => t.S_CODE == model.TaskNo).First();

            if (cgDetail == null) {
                return "找不到对应的任务号";
            }

            cgDetail.F_WEIGHT = model.Weight;
            task.F_WEIGHT = model.Weight;

            try {
                if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY)
                using (var tran = db.Ado.UseTran()) {
                    if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_WEIGHT)
                    .ExecuteCommand() <= 0) {
                    return "修改失败";
                }
                return "修改成功";
                        tran.RollbackTran();
                        return "修改失败";
                    }

                    if (db.Updateable<TN_Task>(task).UpdateColumns(it => it.F_WEIGHT).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return "修改失败";
                    }
                    tran.CommitTran();
                }
                LogHelper.Info($"模拟AGV传递物料重量：修改任务号{task.S_CODE}重量为{model.Weight}", "HosttoagvTask");
                return "修改成功";
            }

            catch (Exception ex) {

                return ex.Message;
            }
        }

        [HttpPost]
        public string AddCntrData() {
            var db = new SqlHelper<object>().GetInstance();
            try {
                //var locCntrRelList = db.Queryable<TN_Loc_Container>();
                //var result = db.Queryable<TN_CG_Detail>()
                //    .GroupBy(d => d.S_CNTR_CODE)  // 按 S_CNTR_CODE 分组
                //    .Select(d => new CntrCodeCountResult {
                //        S_CNTR_CODE = d.S_CNTR_CODE,
                //        Count = SqlFunc.AggregateCount(d.S_ITEM_CODE)  // 计算每组的条目数
                //    })
                //    .ToList();

                //var cntrList = locCntrRelList.Select(c => c.S_CNTR_CODE);

                var result = db.Queryable<TN_CG_Detail>()
                    .LeftJoin<TN_Loc_Container>((detail, container) => detail.S_CNTR_CODE == container.S_CNTR_CODE)
                    .GroupBy(detail => detail.S_CNTR_CODE)
                    .Select((detail, container) => new CntrCodeCountResult {
                        S_CNTR_CODE = detail.S_CNTR_CODE,
                        Count = SqlFunc.AggregateCount(detail.S_ITEM_CODE)
                    })
                    .ToList();

                var cntrList = db.Queryable<TN_Container>().ToList();
                
                var cntrListToUpdate = new List<TN_Container>();
                var cntrListToInsert = new List<TN_Container>();
                foreach (var cntr in result) {
                    var oldCntr = cntrList.Where(c => c.S_CODE == cntr.S_CNTR_CODE).First();
                    if (oldCntr == null) {
                        cntrListToUpdate.Add(new TN_Container { S_CODE = cntr.S_CNTR_CODE, N_DETAIL_COUNT = cntr.Count });
                    }

                    if (oldCntr.N_DETAIL_COUNT != cntr.Count) {
                        cntrListToUpdate.Add(new TN_Container { S_CODE = cntr.S_CNTR_CODE, N_DETAIL_COUNT = cntr.Count });
                    }
                }

                using (var tran = db.Ado.UseTran()) {
                    if (cntrListToUpdate.Count > 0 && db.Updateable(cntrListToUpdate).ExecuteCommand() <= 0) { 
                        tran.RollbackTran();
                        return "更新失败";
                    }
                    if (cntrListToInsert.Count > 0 && db.Insertable(cntrListToInsert).ExecuteCommand() <= 0) {
                        tran.RollbackTran();
                        return "插入失败";
                    }
                    tran.CommitTran();
                }
            }
            catch (Exception ex) {

                return ex.Message;
            }

            return "success";
        }
    }

    public class CntrCodeCountResult {
        public string S_CNTR_CODE { get; set; }  // 容器代码
        public int Count { get; set; }           // 该容器代码对应的条目数
    }

    public class ReturnResults {
@@ -281,14 +244,6 @@

    public class GzResults {
        public List<GzResult> GzResultList { set; get; }
    }

    public class LocCntrCg {
        public string LocCode { get; set; }
        public string LocArea { get; set; }
        public string CntrCode { get; set; }
        public string ItemCode { get; set; }
        public string BatchNo { get; set; }
    }

    /// <summary>
@@ -307,10 +262,6 @@
        /// AGV 下一个状态
        /// </summary>
        public int NextState { set; get; }
    }

    public class CoverInfo {
        public bool IsCover { set; get; } = true;
    }

    public class SetTaskWeightInfo {