From 93f694455c864f586d40be3e2cab171766a52734 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 19 九月 2024 08:22:30 +0800
Subject: [PATCH] `
---
Admin.NET/WCS.Application/Util/HttpService.cs | 4 ++--
Web/src/views/wcs/wcsTask/index.vue | 25 +++++++++++++------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 1119c0f..644eb1b 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -116,8 +116,6 @@
Log.Information("璋冪敤WMS鐢宠鍌ㄤ綅鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
if (result.Success == 0)
{
-
-
var taskUp = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.TaskNo == result.TaskList.TaskNo);
if (taskUp == null)
{
@@ -134,12 +132,14 @@
EndRoadway = result.TaskList.EndRoadway
};
_db.Insertable(taskAdd).ExecuteCommand();
+ HubUtil.PublicTask(taskAdd.Adapt<WcsTaskOutput>());
}
else
{
taskUp.EndRoadway = result.TaskList.EndRoadway;
taskUp.EndLocate = result.TaskList.EndLocate;
_db.Updateable(taskUp).ExecuteCommand();
+ HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
}
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 997ec93..0168614 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -89,20 +89,21 @@
<el-table-column prop="lotNo" label="鎵规鍙�" show-overflow-tooltip="" />
<el-table-column prop="skuNo" label="鐗╂枡缂栫爜" show-overflow-tooltip="" />
<el-table-column prop="skuName" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="unstackingMode" width="100" label="鎷嗗灈鏂瑰紡" show-overflow-tooltip="">
+ <el-table-column prop="unstackingMode" width="100" label="鎷嗗灈鏂瑰紡" show-overflow-tooltip="">
<template #default="scope">
<span v-if="scope.row.unstackingMode">
- <el-tag :type="dv('UnstackingModeEnum', scope.row.unstackingMode)?.tagType"> {{ dv('UnstackingModeEnum',
- scope.row.unstackingMode)?.name }}</el-tag>
- </span>
+ <el-tag :type="dv('UnstackingModeEnum', scope.row.unstackingMode)?.tagType"> {{
+ dv('UnstackingModeEnum',
+ scope.row.unstackingMode)?.name }}</el-tag>
+ </span>
</template>
</el-table-column>
- <el-table-column prop="isBind" width="85" label="鏄惁缁戝畾" show-overflow-tooltip="">
+ <el-table-column prop="isBind" width="85" label="鏄惁缁戝畾" show-overflow-tooltip="">
<template #default="scope">
- <span v-if="scope.row.isBind!=null">
+ <span v-if="scope.row.isBind != null">
<el-tag :type="dv('IsBindEnum', scope.row.isBind)?.tagType"> {{ dv('IsBindEnum',
- scope.row.isBind)?.name }}</el-tag>
- </span>
+ scope.row.isBind)?.name }}</el-tag>
+ </span>
</template>
</el-table-column>
<el-table-column prop="stationNum" label="鎷嗗灈宸ヤ綅鍙�" show-overflow-tooltip="" />
@@ -113,7 +114,7 @@
<ModifyRecord :data="scope.row" />
</template>
</el-table-column> -->
- <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="200" align="center" fixed="right" show-overflow-tooltip=""
+ <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="150" align="center" fixed="right" show-overflow-tooltip=""
v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
<template #default="scope">
<template v-if="scope.row.status <= 1">
@@ -122,9 +123,9 @@
<el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
v-auth="'wcsTask:cancell'"> 鍙栨秷 </el-button>
</template>
- <template v-if="scope.row.status == 2">
+ <template v-if="scope.row.status == 2 && scope.row.origin == 'WMS'">
<el-button icon="ele-Upload" size="small" text="" type="primary" @click="uploadTask(scope.row)"
- v-auth="'wcsTask:cancell'"> 涓婁紶 </el-button>
+ v-auth="'wcsTask:cancell'"> 涓婁紶 </el-button>
</template>
</template>
</el-table-column>
@@ -194,7 +195,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
-import { pageWcsTask, finshWcsTask,uploadWcsTask } from '/@/api/wcs/wcsTask';
+import { pageWcsTask, finshWcsTask, uploadWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';
--
Gitblit v1.8.0