修复盘点计划单、盘点单的状态更改逻辑

kazelee

7 天以前 00aaf49a223be04fc58f6f7c09d95ce4b22ef087

 core/WCSCore.cs

@@ -103,6 +103,7 @@
                    break;
                case 2: // 完成
                    WCSHelper.End(TN_Task); // 任务状态改成结束

                    break;
                case 7: // 异常
                    TaskProcess.OperateStatus(TN_Task, 7); // 异常处理
@@ -164,10 +165,12 @@

                if (data.Count == 0) {
                    LogHelper.Info("设置终点货位失败：没有接受到来自国自AGV的重量信息");
                    //return; // TODO 正式运行有国自AGV的时候恢复
                    //cgDetail.F_QTY = 0; // 不设置为空，便于测试时预先设置一个正常值
                }
                else {
                    var weight = float.Parse(data[0].parameter_varchar200_up);
                    var weight_str = data[0].parameter_varchar200_up.Split(';')[1].Split('-')[1];

                    var weight = float.Parse(weight_str);
                    cgDetail.F_QTY = weight;
                    tn_task.F_WEIGHT = weight;

@@ -204,12 +207,32 @@
                    return;
                }

                //row -= 100; // 111-118 => 1-8

                // 只当之前指定终点货架后，才尝试计算终点货位
                if (cgDetail.F_QTY > 2000) {
                    // 重量超过 2t 
                    endLoc = null;
                    LogHelper.Info("重量超过2t，不允许入库");
                    return;

                    // 传递给国自AGV
                    if (GZRobot.TryGetInteractionInfoId(tn_task.S_CODE, out var id1)) {
                        if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
                            type_name = "GET_DST",
                            interaction_info_id = id1,
                            info_status = "error",
                        })) {
                            LogHelper.Info($"国自AGV接受超重取消信息成功", "HosttoagvTask");
                        }
                        else {
                            LogHelper.Info($"国自AGV接受超重取消信息失败", "HosttoagvTask");
                        }
                    }
                    else {
                        LogHelper.Info($"AGV：获取任务{tn_task.S_CODE}的interaction_info_id失败！", "HosttoagvTask");
                    }

                    return; // 超重会自己return，如果国自agv没接受到也不需要提前return
                }
                else if (cgDetail.F_QTY > 1500) {
                    // 重量超过1.5t，需要选择1-2层货架
@@ -232,18 +255,17 @@

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

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

                    //var request = new UpdateInteractInfo {
                    //    interaction_info_id = 3, // 更改终点信息
                    //    info_status = "active",
                    //    return_value = "",
                    //};

                    //GZRobot.UpdateInteractInfo(request);

                    if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
                            .ExecuteCommand() > 0) {
                        //LocationHelper.LockLoc(endLoc.S_CODE, 1);//终点入库锁
@@ -258,6 +280,26 @@
                    tn_task.S_END_LOC = endLoc.S_CODE;

                    LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                    // 传递给国自AGV
                    if (GZRobot.TryGetInteractionInfoId(tn_task.S_CODE, out var id2)) {
                        if (GZRobot.UpdateInteractInfo(new UpdateInteractInfo {
                            type_name = "GET_DST",
                            interaction_info_id = id2,
                            info_status = "invalid",
                            return_value = LocationHelper.GetAgvSite(tn_task.S_END_LOC), // 目前使用agvsite
                        })) {
                            LogHelper.Info($"国自AGV接受终点信息成功", "HosttoagvTask");
                        }
                        else {
                            LogHelper.Info($"国自AGV接受终点信息失败", "HosttoagvTask");
                            return;
                        }
                    }
                    else {
                        LogHelper.Info($"AGV：获取任务{tn_task.S_CODE}的interaction_info_id失败！", "HosttoagvTask");
                        return;
                    }

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_Task>(tn_task).UpdateColumns(it => new { it.S_END_LOC })
@@ -304,8 +346,9 @@
                    LogHelper.Info("更新物料重量失败：没有接受到来自国自AGV的重量信息");
                    return;
                }
                var weight_str = data[0].parameter_varchar200_up.Split(';')[1].Split('-')[1];

                var weight = float.Parse(data[0].parameter_varchar200_up);
                var weight = float.Parse(weight_str);
                cgDetail.F_QTY = weight;

                if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY).ExecuteCommand() <= 0) {
@@ -337,8 +380,6 @@
                {
                    //使用自定义任务推送
                    TaskProcess.SendTask(task);//调度NDC或杭奥或国自设备
                    //TaskProcess.SendGZTask(task);///调度国自设备

                });
            }
            else