修复数据库表字段不匹配、读取重量错误处理等逻辑

kazelee

2025-05-20 ef839d119eec2c28fac5f5ba175d71f926afae44

 Services/AgvService.cs

@@ -46,7 +46,7 @@

                result.ResultCode = 0;
                result.ResultMsg = "success";
                LogHelper.Info(result.ResultMsg, "API");
                LogHelper.Info(result.ResultMsg + $": state {model.state}", "API");
                return result;
            }
            catch (Exception ex) {
@@ -85,14 +85,14 @@
                    WCSHelper.UpdateStatus(TN_Task, "取货完成"); // 任务状态改成取货完成

                    var captureTask = Task.Run(() => {
                        if (TN_Task.S_TYPE == TaskName.货品入库 || TN_Task.S_TYPE == TaskName.产品部分回库) {
                        if (TN_Task.S_TYPE == TaskName.产品入库 || TN_Task.S_TYPE == TaskName.产品部分回库) {
                            CapturePic(TN_Task);
                        }
                    });

                    var setEndLocTask = Task.Run(() => {
                        // 只要任务为产品入库(PDA)，就需要重新指定终点（默认endLoc为""）
                        if (TN_Task.S_TYPE == "产品入库(PDA)") {
                        if (TN_Task.S_TYPE == TaskName.产品入库) {
                            SetEndLoc(TN_Task);
                        }
                    });
@@ -126,6 +126,7 @@

            var filepath = SnapManager.GetCapturePicturePath();
            if (string.IsNullOrEmpty(filepath)) {
                LogHelper.Info("图片地址为空");
                return;
            }

@@ -140,50 +141,73 @@

        public static void SetEndLoc(TN_Task tn_task) {
            var db = DbHelper.GetDbClient();
            var endLoc = new TN_Location();
            var endLoc = db.Queryable<TN_Location>()
                .First(a => a.S_CODE == tn_task.S_END_LOC);

            // 如果已经设置的终点货位，就不要再进入这个流程
            if (endLoc != null) {
                LogHelper.Info("已经设置了终点货位：" + JsonConvert.SerializeObject(endLoc));
                return;
            }

            var cgDetail = db.Queryable<TN_CG_Detail>()
                .Where(d => d.S_CNTR_CODE == tn_task.S_CNTR_CODE).First();

            if (cgDetail == null) {
                LogHelper.Info("设置终点货位失败：当前任务的托盘号在物料表中不存在");
                return;
            }

            var data = GZRobot.CustomBuf();

            if (data.Count == 0) {
                LogHelper.Info("设置终点货位失败：没有接受到来自国自AGV的重量信息");

                //return;
                //return; // TODO 正式运行有国自AGV的时候恢复
            }
            else {
                var weight = float.Parse(data[0].parameter_varchar200_up);
                tn_task.F_WEIGHT = weight;
                cgDetail.F_QTY = weight;

                if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => it.F_WEIGHT).ExecuteCommand() <= 0) {
                    LogHelper.Info("修改Task重量失败");
                if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY).ExecuteCommand() <= 0) {
                    LogHelper.Info("修改物料表重量失败");
                    return;
                }
            }

            // 终点货架为空时，不判断，交给人工处理
            if (tn_task.S_END_AREA == "") {
            if (tn_task.S_END_LOC == "0") {
                LogHelper.Info("终点货架为空，不处理");
                return;
            }

            if (!int.TryParse(tn_task.S_END_LOC.Trim(), out int row)) {
                LogHelper.Info($"终点货架号 '{tn_task.S_END_LOC}' 无法转成数字");
                return;
            }

            // 只当之前指定终点货架后，才尝试计算终点货位
            if (tn_task.F_WEIGHT > 1500) {
            if (cgDetail.F_QTY > 1500) {
                // 重量超过1.5t，需要选择1-3层货架
                endLoc = db.Queryable<TN_Location>().First(a => a.S_SHELF_CODE == tn_task.S_END_AREA && LocationHelper.IsFree(a) && a.N_CURRENT_NUM == 0 && a.N_LAYER <= 3);
                endLoc = db.Queryable<TN_Location>()
                    .First(a => a.N_ROW == row && a.N_LAYER <= 3
                    && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y");
            }
            else if (tn_task.F_WEIGHT > 0) {
            else if (cgDetail.F_QTY > 0) {
                // 重量未超过1.5t，在指定货架随便选择1个
                endLoc = db.Queryable<TN_Location>().First(a => a.S_SHELF_CODE == tn_task.S_END_AREA && LocationHelper.IsFree(a) && a.N_CURRENT_NUM == 0);
                endLoc = db.Queryable<TN_Location>().First(a => a.N_ROW == row
                    && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y");
            }
            else {
                // 没有接收到重量，或重量出错
                endLoc = null;
                LogHelper.Info($"错误的重量信息：{tn_task.F_WEIGHT}");
                LogHelper.Info($"错误的重量信息：{cgDetail.F_QTY}");
                return;
            }

            // 如果没有符合条件的货位，置空，等待PDA重新确定
            if (endLoc == null) {
                tn_task.S_END_AREA = "";
                tn_task.S_END_LOC = "";
                tn_task.S_END_AREA = "HJQ";
                tn_task.S_END_LOC = "0";

                // 不需要再给GZ AGV传空值，一开始就没给具体货位，只给了Area

@@ -196,16 +220,16 @@
                //GZRobot.UpdateInteractInfo(request);

                using (var trans = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC, it.F_WEIGHT })
                    if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
                        .ExecuteCommand() > 0) {
                        //LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

                        trans.CommitTran();
                        LogHelper.Info($"重新计算后没有合适货位，任务 {tn_task.S_CODE} 修改成功，修改终点货架和货位为空");
                        LogHelper.Info($"重新计算后没有合适货位，任务 {tn_task.S_CODE} 修改成功，修改终点货位为 0空");
                    }
                    else {
                        trans.RollbackTran();
                        LogHelper.Info($"重新计算后没有合适货位，任务 {tn_task.S_CODE} 修改失败，修改终点货架和货位为空");
                        LogHelper.Info($"重新计算后没有合适货位，任务 {tn_task.S_CODE} 修改失败，修改终点货位为 0空");
                    }
                }
            }
@@ -214,17 +238,17 @@
                tn_task.S_END_LOC = endLoc.S_CODE;

                using (var trans = db.Ado.UseTran()) {
                    if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC, it.F_WEIGHT })
                    if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
                        .ExecuteCommand() > 0) {
                        LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁

                        trans.CommitTran();
                        LogHelper.Info($"计算货位成功，任务 {tn_task.S_CODE} 修改成功，终点货架为 {endLoc.S_SHELF_CODE}，修改终点位置为 {endLoc.S_CODE}");
                        LogHelper.Info($"计算货位成功，任务 {tn_task.S_CODE} 修改成功，终点货架为 {endLoc.N_ROW}，修改终点位置为 {endLoc.S_CODE}");
                    }
                    else {
                        trans.RollbackTran();

                        LogHelper.Info($"计算货位成功，任务 {tn_task.S_CODE} 修改失败，终点货架为 {endLoc.S_SHELF_CODE}，修改终点位置为 {endLoc.S_CODE}");
                        LogHelper.Info($"计算货位成功，任务 {tn_task.S_CODE} 修改失败，终点货架为 {endLoc.N_ROW}，修改终点位置为 {endLoc.S_CODE}");
                    }
                }
            }