0725

海波 张

4 天以前 265fbfa342cc03991c79934b162f26c0a6699f95

 process/TaskProcess.cs

@@ -1029,7 +1029,7 @@
                    {
                        LocationHelper.UnLockLoc(work.CONNECTION);
                    }
                        result.errCode = 0;
                    result.errCode = 0;
                    result.errMsg = "取消成功";
                    result.success = true;
                    return result;
@@ -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
                            {
@@ -1955,7 +1954,7 @@
                                if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
                                {
                                    LogHelper.Info($"ZCSendTask入库任务工装是二合一库,需要物料均衡", "Mes任务下发");
                                    balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, model.PROD_NO);
                                    balanceLocList = LocationHelper.RoadWayBalance1ByItem(endList, model.PROD_NO);
                                }
                                else {
                                    balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
@@ -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,
                    };

@@ -2491,7 +2490,7 @@
                        S_START_AREA_NAME = start.S_AREA_Name,
                        //起点库区名称
                        S_END_AREA_NAME = end.S_AREA_Name,
                        //起点库区名称
                        //接驳库区名称
                        CONNECTION_AREA = connectionArea
                    };