From ee8d6bd6c4077c3aeb84170bec819264b5ca29d8 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:32:53 +0800
Subject: [PATCH] 任务列表增加单据查询
---
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs | 7 ++++++-
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 8 +++++---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 1 +
Admin.NET/WCS.Application/Util/HttpService.cs | 3 ++-
Admin.NET/WCS.Application/Entity/WcsTask.cs | 8 +++++++-
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs | 5 +++++
Admin.NET/WCS.Application/Model/TaskRequest.cs | 5 ++++-
Web/src/views/wcs/wcsTask/index.vue | 10 ++++++++--
8 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/Admin.NET/WCS.Application/Entity/WcsTask.cs b/Admin.NET/WCS.Application/Entity/WcsTask.cs
index 4377e69..0b5f99e 100644
--- a/Admin.NET/WCS.Application/Entity/WcsTask.cs
+++ b/Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -162,5 +162,11 @@
/// </summary>
[SugarColumn(ColumnName = "IsBale", ColumnDescription = "鏄惁瑁瑰寘")]
public string IsBale { get; set; }
-
+
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "OrderNo", ColumnDescription = "鍗曟嵁鍙�", Length = 20)]
+ public string? OrderNo { get; set; }
+
}
diff --git a/Admin.NET/WCS.Application/Model/TaskRequest.cs b/Admin.NET/WCS.Application/Model/TaskRequest.cs
index 2b9fcd9..54d15bf 100644
--- a/Admin.NET/WCS.Application/Model/TaskRequest.cs
+++ b/Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -95,7 +95,10 @@
public string Qty { get; set; }
public string CompleteQty { get; set; }
-
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
}
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index dce0887..f7ee732 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -136,10 +136,10 @@
//IsSuccess =TaskSuccessEnum.Success,
Levels = 999,
Origin = "WMS",
- StartRoadway= models.StartRoadway,
+ StartRoadway = models.StartRoadway,
StartLocate = models.StartLocate,
EndLocate = models.EndLocate,
- EndRoadway= models.EndRoadway,
+ EndRoadway = models.EndRoadway,
PalletNo = models.PalletNo,
IsBale = bale,
@@ -147,7 +147,9 @@
LotNo = models.LotNo,
SkuName = models.SkuName,
Qty = int.Parse(nqty),
- CompleteQty = int.Parse(ncomqty)
+ CompleteQty = int.Parse(ncomqty),
+
+ OrderNo = models.OrderNo
};
_db.Insertable(taskAdd).ExecuteCommand();
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
index 39dba5f..897d0f5 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
@@ -206,6 +206,11 @@
/// </summary>
public string? Origin { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ public string? OrderNo { get; set; }
+
}
/// <summary>
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs
index 42d0771..8652d26 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs
@@ -129,7 +129,12 @@
/// 瀹屾垚鏃堕棿
/// </summary>
public DateTime? FinishDate { get; set; }
-
+
+ /// <summary>
+ /// 鍗曟嵁鍙�
+ /// </summary>
+ public string? OrderNo { get; set; }
+
/// <summary>
/// 鏈�鍚庡啓鍏ユ祦绋嬫帶鍒跺瓧鍊�
/// </summary>
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 5dd75ac..2cd928f 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -51,6 +51,7 @@
u.TaskNo.Contains(input.SearchKey)
)
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.OrderNo), u => u.OrderNo.Contains(input.OrderNo.Trim()))
.WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType)
.WhereIF(input.Status.HasValue, u => u.Status == input.Status)
.WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 7daa117..7e9fd77 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -64,7 +64,8 @@
TaskNo = result.TaskList.TaskNo,
Levels = 999,
EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
+ EndRoadway = result.TaskList.EndRoadway,
+ OrderNo=result.TaskList.OrderNo
};
_db.Insertable(taskAdd).ExecuteCommand();
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 91ceda3..f1d7806 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -16,7 +16,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="浠诲姟鍙�">
- <el-input v-model="queryParams.taskNo" clearable="" placeholder=" " />
+ <el-input v-model="queryParams.taskNo" clearable="" placeholder="璇疯緭鍏ヤ换鍔″彿" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
@@ -38,6 +38,11 @@
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
<el-form-item label="鎵樼洏鍙�">
<el-input v-model="queryParams.palletNo" clearable="" placeholder="璇疯緭鍏ユ墭鐩樺彿" />
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+ <el-form-item label="鍗曟嵁鍙�">
+ <el-input v-model="queryParams.orderNo" clearable="" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
@@ -85,11 +90,12 @@
<el-table-column prop="startLocate" label="璧峰浣嶇疆" show-overflow-tooltip="" />
<el-table-column prop="endLocate" label="缁撴潫浣嶇疆" show-overflow-tooltip="" />
<el-table-column prop="palletNo" label="鎵樼洏鍙�" show-overflow-tooltip="" />
+ <el-table-column prop="orderNo" label="鍗曟嵁鍙�" show-overflow-tooltip="" />
<el-table-column prop="qty" label="鎷嗗灈绠辨暟" show-overflow-tooltip="" />
<el-table-column prop="palletQty" label="鏁磋泛绠辨暟" show-overflow-tooltip="" />
<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="skuName" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" />
<el-table-column prop="unstackingMode" width="100" label="鎷嗗灈鏂瑰紡" show-overflow-tooltip="">
<template #default="scope">
<span v-if="scope.row.unstackingMode">
--
Gitblit v1.8.0