From c2fd3f896f2194529eb559b979107684ce39cb42 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 24 十二月 2025 14:38:07 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 26 ------------
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue | 8 ++-
项目代码/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 45 +++++++++-------------
项目代码/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 28 +++++---------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 1
5 files changed, 36 insertions(+), 72 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index f5c8e2e..3f548de 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -15,31 +15,7 @@
modelFooter: ''
},
tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [
- {
- name: '閲嶄笅浠诲姟',
- type: 'primary',
- value: '閲嶄笅浠诲姟',
- onClick: async function () {
- const selectRows = this.$refs.table.getSelected();
- if (selectRows.length == 0) return ElMessage.warning('璇烽�夋嫨涓�鏉′换鍔�');
- if (selectRows.length > 1) return ElMessage.warning('鍙兘閫夋嫨涓�鏉′换鍔�');
- const taskNum = selectRows[0].taskId;
- try{
- const response = await http.post('api/Task/RecreateTasks?taskNums='+taskNum, '浠诲姟閲嶄笅涓�...');
- const { status, message ,data} = response;
- if (status) {
- ElMessage.success(`閲嶄笅浠诲姟鎴愬姛`);
- this.refresh();
- }else{
- ElMessage.error(`閲嶄笅浠诲姟澶辫触锛�${message}`);
- }
- }catch(err){
- ElMessage.error(`閲嶄笅浠诲姟寮傚父锛�${err.message}`);
- }
- }
- }
- ], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ buttons: { view: [ ], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
index 48529e7..6aee2bd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfoDetail.vue"
@@ -114,14 +114,14 @@
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "decimal",
- width: 90,
+ width: 150,
align: "left",
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 150,
align: "left",
},
{
@@ -130,6 +130,7 @@
type: "int",
width: 120,
align: "left",
+ hidden: true,
},
{
field: "supplyCode",
@@ -163,7 +164,7 @@
field: "outboundQuantity",
title: "鍑哄簱鏁伴噺",
type: "string",
- width: 180,
+ width: 120,
align: "left",
},
{
@@ -208,6 +209,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true,
},
]);
const detail = ref({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index e69ad6d..4785cf7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -1,19 +1,11 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/taskinfo/task.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -45,17 +37,16 @@
[
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ // { title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- //{ title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
- { title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskType", data: [], },
+ { title: "浠诲姟鐘舵��", field: "taskStatus", type: "selectList", dataKey: "taskStatusEnum", data: [], },
],
[
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ // { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
@@ -89,6 +80,7 @@
type: "string",
width: 120,
align: "left",
+ hidden: true,
},
{
field: "taskType",
@@ -161,7 +153,7 @@
type: "datetime",
width: 160,
align: "left",
- hidden:true,
+ hidden: true,
},
{
field: "wMSId",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index dab85d1..93aa854 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -1,19 +1,11 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
</view-grid>
</template>
- <script>
+<script>
import extend from "@/extension/taskinfo/task_hty.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
@@ -42,20 +34,20 @@
createDate: "",
});
const searchFormOptions = ref([
- [
+ [
{ title: "浠诲姟鍙�", field: "taskNum", type: "int" },
{ title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ // { title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- //{ title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
- { title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ { title: "浠诲姟绫诲瀷", field: "taskType", type: "selectList", dataKey: "taskType", data: [], },
+ { title: "浠诲姟鐘舵��", field: "taskStatus", type: "selectList", dataKey: "taskStatusEnum", data: [], },
+ // { title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
[
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ // { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
@@ -89,15 +81,16 @@
type: "string",
width: 120,
align: "left",
+ hidden: true,
},
- // {
- // field: "taskType",
- // title: "浠诲姟绫诲瀷",
- // type: "int",
- // width: 120,
- // align: "left",
- // bind: { key: "taskType", data: [] },
- // },
+ {
+ field: "taskType",
+ title: "浠诲姟绫诲瀷",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskType", data: [] },
+ },
{
field: "taskStatus",
title: "浠诲姟鐘舵��",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 107197e..b5af0e3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -591,6 +591,7 @@
_stockService.StockInfoService.Db.UpdateNav(stock).IncludesAllFirstLayer().ExecuteCommand();
+ task.TaskStatus = (int)TaskStatusEnum.Finish;
var result = _task_HtyService.DeleteAndMoveIntoHty(task, OperateTypeEnum.鑷姩瀹屾垚);
if (!result)
{
--
Gitblit v1.9.3