金坛二合一出库修改

海波 张

1 天以前 3a56820d028e98ac3c4bd315aa76181d7d6720cd

 process/TaskProcess.cs

@@ -54,13 +54,13 @@
            if (load)
            {
                Console.WriteLine($"任务{mst.S_CODE} 货位{mst.S_START_LOC}取货完成，起点解绑容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_START_LOC}取货完成，起点解绑容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_START_LOC}取货完成，起点解绑容器{mst.S_CNTR_CODE}","解锁");
                LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
            }
            else
            {
                Console.WriteLine($"任务{mst.S_CODE} 货位{mst.S_END_LOC}卸货完成，终点绑定容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_END_LOC}卸货完成，终点绑定容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_END_LOC}卸货完成，终点绑定容器{mst.S_CNTR_CODE}","解锁");
                LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
            }

@@ -71,7 +71,7 @@
        /// </summary>
        /// <param name="mst"></param>
        internal static void CacheBitCancelUpdate(WMSTask mst) {

            LogHelper.Info($"CacheBitCancelUpdate解锁：任务号：{mst.S_CODE}", "解锁");
            LocationHelper.UnLockLoc(mst.S_START_LOC);
            LocationHelper.UnLockLoc(mst.S_END_LOC);

@@ -245,9 +245,6 @@

            try
            {
               
               

                //空托入库判断空托出缓存表，有对应记录直接改道到缓存表终点
                if (workFlow.FLOWCODE=="3") {
                    var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").OrderBy(a=>a.CreateDate).First();
@@ -1023,13 +1020,15 @@
                    work.T_END_TIME = DateTime.Now;
                    var db = new SqlHelper<object>().GetInstance();
                    db.Updateable(work).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY, it.T_END_TIME }).ExecuteCommand();

                    LogHelper.Info($"cancelTask1取消{model.task_no}，解锁", "解锁");
                    LocationHelper.UnLockLoc(work.S_START_LOC);
                    LocationHelper.UnLockLoc(work.S_END_LOC);
                    if (!string.IsNullOrEmpty(work.CONNECTION))
                    {
                        LocationHelper.UnLockLoc(work.CONNECTION);
                    }
                        result.errCode = 0;
                    result.errCode = 0;
                    result.errMsg = "取消成功";
                    result.success = true;
                    return result;
@@ -1050,6 +1049,7 @@
                                //未执行直接修改状态为取消
                                TaskHelper.opMesTask(task, 3);
                                TaskHelper.Fail(task);

                                TaskProcess.CacheBitCancelUpdate(task);

                                ContainerHelper.delCntr(task.S_CNTR_CODE);
@@ -1111,7 +1111,7 @@
                        if (wcsTask != null)
                        {
                            LogHelper.Info($"cancelTask1取消Wcs任务{wcsTask.S_CODE}", "取消");
                            if (wcsTask.S_B_STATE.Trim() == "未执行" && task.S_B_STATE.Trim() == "未执行")
                            if (wcsTask.S_B_STATE.Trim() == "未执行")
                            {
                                //未执行直接修改状态为取消
                                TaskHelper.Fail(wcsTask);
@@ -1119,7 +1119,6 @@
                                result.errCode = 0;
                                result.errMsg = "取消成功";
                                result.success = true;
                                return result;
                            }
                            else
                            {
@@ -2137,7 +2136,7 @@
                    cntr1.S_CODE = cntrCode;
                    cntr1.C_ENABLE = "Y";
                    cntr1.N_DETAIL_COUNT = cntrCount;
                    cntr1.S_TYPE = "";
                    cntr1.S_TYPE = TOOLSTYPE;

                    LogHelper.Info($"添加容器信息" + JsonConvert.SerializeObject(cntr1), "Mes任务下发");
                    if (ContainerHelper.CreateCntr(cntr1))
@@ -2185,7 +2184,7 @@
                        S_START_AREA_NAME = start.S_AREA_Name,
                        //起点库区名称
                        S_END_AREA_NAME = end.S_AREA_Name,
                        //起点库区名称
                        //接驳库区名称
                        CONNECTION_AREA = connectionArea,
                    };

@@ -2194,6 +2193,7 @@
                    {
                        if (connection != "")
                        {
                            LogHelper.Info($"{operation.S_CODE}锁货位", "上锁");
                            LocationHelper.LockLoc(operation.S_START_LOC, "出库锁", 2);
                            LocationHelper.LockLoc(operation.S_END_LOC, "入库锁", 1);
                            LocationHelper.LockLoc(operation.CONNECTION, "其他锁", 3);
@@ -2491,7 +2491,7 @@
                        S_START_AREA_NAME = start.S_AREA_Name,
                        //起点库区名称
                        S_END_AREA_NAME = end.S_AREA_Name,
                        //起点库区名称
                        //接驳库区名称
                        CONNECTION_AREA = connectionArea
                    };