From c827fe7b0c5b3b444d76ba0d96a2649c764630dd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 14 十一月 2024 16:36:08 +0800
Subject: [PATCH] 修改WCS、WMS出入库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index d2e92d9..b86ecfe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -22,9 +22,9 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
-using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
@@ -60,6 +60,11 @@
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
isNormal = false;
}
+ else if (!int.TryParse(Enum.Parse<TaskCarStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(TaskCarStatusEnum)result > (int)TaskCarStatusEnum.RelocationCarFinish)
+ isNormal = false;
+ }
Dt_TaskExecuteDetail taskExecuteDetail = new()
{
IsManual = App.User.UserId > 0,
@@ -78,7 +83,11 @@
}
}
-
+ /// <summary>
+ /// 璁板綍鎺ユ敹WMS涓嬪彂浠诲姟
+ /// </summary>
+ /// <param name="taskNums"></param>
+ /// <param name="description"></param>
public void AddTaskExecuteDetail(List<int> taskNums, string description = "")
{
try
@@ -102,6 +111,11 @@
if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
isNormal = false;
}
+ else if (!int.TryParse(Enum.Parse<TaskCarStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(TaskCarStatusEnum)result > (int)TaskCarStatusEnum.RelocationCarFinish)
+ isNormal = false;
+ }
Dt_TaskExecuteDetail taskExecuteDetail = new()
{
IsManual = App.User.UserId > 0,
--
Gitblit v1.9.3