From f0088fd96c74f68ba912593710dd9271bcee581d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 23 12月 2024 10:12:32 +0800
Subject: [PATCH] NG处理，pda上增加一键 清理 板件队列（从 269 到bz01的队列数据）
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 19 +++++++++
LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js | 7 +++
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue | 28 ++++++++++++++
LuLiScreen/index.html | 16 ++++----
LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue | 1
5 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
index 5e4caba..cfa7484 100644
--- a/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
+++ b/LA24030_LuLiPackageLine_Pda/api/putIn/artificial.js
@@ -246,6 +246,13 @@
data: data
})
}
+export function OneKeyClearUpiQueue(data){
+ return request({
+ url: `/api/WmsOperationTask/OneKeyClearUpiQueue`,
+ method: 'post',
+ data: data
+ })
+}
export function PartClear(data){
return request({
url: `/api/WmsOperationTask/PartClear`,
diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue
index 8eb98f2..b95c484 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/exceptionHandle.vue
@@ -44,6 +44,12 @@
<button class=" bg-grey" @click="do_PartClear">269浣嶇疆娓呴櫎鎵爜淇℃伅</button>
</u-form-item>
</u-col>
+ <u-col span="12">
+
+ <u-form-item label="" class="uFormItem">
+ <button class=" bg-grey" @click="do_OneKeyClearUpiQueue">涓�閿竻闄�269浣嶇疆鍒癇Z01鐨勬澘浠堕槦鍒�</button>
+ </u-form-item>
+ </u-col>
</u-row>
</u-form>
</div>
@@ -56,6 +62,7 @@
import {
WmsOperationTaskSetNG,
PartClear,
+ OneKeyClearUpiQueue,
querySingleUpiByUpi,
getenumDataList,
} from "@/api/putIn/artificial.js";
@@ -177,6 +184,27 @@
this.detailshow = true;
},
+ do_OneKeyClearUpiQueue() {
+ const params = {
+ };
+ uni.showModal({
+ title: "涓�閿竻闄�269浣嶇疆鍒癇Z01鐨勬澘浠堕槦鍒�",
+ content: "鏄惁纭 涓�閿竻闄�269浣嶇疆鍒癇Z01鐨勬澘浠堕槦鍒楋紵",
+ showCancel: true,
+ cancelColor: "#333333",
+ success: (res) => {
+ if (res.confirm) {
+ OneKeyClearUpiQueue(params).then((res) => {
+ this.rescode = 200;
+ this.$refs.resmodal.show = true;
+ this.resmessage = "涓�閿竻闄�269浣嶇疆鍒癇Z01鐨勬澘浠堕槦鍒楁垚鍔�";
+ });
+ } else if (res.cancel) {
+ }
+ },
+ });
+
+ },
//纭
do_PartClear() {
const params = {
diff --git a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
index 81f043e..9a1cd16 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/takeMaterial/orderpiece/orderpiece.vue
@@ -311,6 +311,7 @@
import {
WmsOperationTaskSetNG,
WmsOperationTaskCancelNG,
+ OneKeyClearUpiQueue,
querySingleUpiByUpi,
getenumDataList,
} from "@/api/putIn/artificial.js";
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
index e8c37cd..5364416 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -868,5 +868,24 @@
}
}
+
+ /// <summary>
+ /// 涓�閿竻鐞嗘澘浠堕槦鍒楁暟鎹�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "OneKeyClearUpiQueue")]
+ [Description("WmsOperationTask/OneKeyClearUpiQueue")]
+ [UnitOfWork]
+ public async Task OneKeyClearUpiQueue()
+ {
+ var upiList = await _mes_Upi_LineQueueRep.AsQueryable().ToListAsync();
+ if (upiList?.Count == 0)
+ {
+ throw Oops.Oh($"娌℃湁鏉夸欢鏁版嵁");
+ }
+ await _mes_Upi_LineQueueRep.DeleteAsync(upiList);
+
+ }
}
diff --git a/LuLiScreen/index.html b/LuLiScreen/index.html
index b9e3933..5b52d0f 100644
--- a/LuLiScreen/index.html
+++ b/LuLiScreen/index.html
@@ -120,7 +120,7 @@
<div class="tt">
<span>鐢熶骇鍗曞彿</span>
<span>鎬诲寘鏁�</span>
- <span>鏄惁榻愬</span>
+ <span>鏁翠綋涓嬬嚎</span>
<span>宸蹭笅绾垮寘鏁�</span>
<!-- <span>鏈笅绾垮寘鏁�</span> -->
<span>鎬诲寘瑁呴潰绉�</span>
@@ -154,7 +154,7 @@
<div class="tt">
<span>鐢熶骇鍗曞彿</span>
<span>鎬诲寘鏁�</span>
- <span>鏄惁榻愬</span>
+ <span>鏁翠綋涓嬬嚎</span>
<span>宸蹭笅绾垮寘鏁�</span>
<!-- <span>鏈笅绾垮寘鏁�</span> -->
<span>鎬诲寘瑁呴潰绉�</span>
@@ -178,7 +178,7 @@
<div class="tt">
<span>鐢熶骇鍗曞彿</span>
<span>鎬诲寘鏁�</span>
- <span>鏄惁榻愬</span>
+ <span>鏁翠綋涓嬬嚎</span>
<span>宸蹭笅绾垮寘鏁�</span>
<!-- <span>鏈笅绾垮寘鏁�</span> -->
<span>鎬诲寘瑁呴潰绉�</span>
@@ -223,7 +223,7 @@
listItems1 += `<li>
<span>${item.info5}</span> <!-- 鐢熶骇鍗曞彿 -->
<span>${item.packageNum}</span> <!-- 鍖呮暟 -->
- <span style="color: ${item.isKitting ? 'white' : '#ea6767'};">${item.isKitting ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
+ <span style="color: ${item.isUnline ? 'white' : '#ea6767'};">${item.isUnline ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
<span>${item.unLinePackageNum}</span> <!-- 宸蹭笅绾垮寘鏁� -->
<span>${item.allPackageArea}</span> <!-- 鎬诲寘瑁呴潰绉� -->
<span>${item.scanPackageArea}</span> <!-- 宸叉壂鎻忓寘瑁呴潰绉� -->
@@ -236,7 +236,7 @@
// <span>${item.Info5}</span> <!-- 鐢熶骇鍗曞彿 -->
// <span>${item.planNo}</span> <!-- 鎵规鍙� -->
// <span>${item.orderId}</span> <!-- 璁㈠崟鍙� -->
- // <span>${item.isKitting}</span> <!-- 鏄惁榻愬 -->
+ // <span>${item.isUnline}</span> <!-- 鏄惁榻愬 -->
// <span>${item.isUnline}</span> <!-- 鏄惁涓嬬嚎 -->
// <span>${item.unlineTime}</span> <!-- 涓嬬嚎鏃堕棿 -->
// <span>${item.unlinePerson}</span> <!-- 涓嬬嚎浜� -->
@@ -260,7 +260,7 @@
listItems1 += `<li>
<span>${item.info5}</span>
<span>${item.packageNum}</span>
- <span style="color: ${item.isKitting ? 'white' : '#ea6767'};">${item.isKitting ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
+ <span style="color: ${item.isUnline ? 'white' : '#ea6767'};">${item.isUnline ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
<span>${item.unLinePackageNum}</span>
<span>${item.allPackageArea}</span>
<span>${item.scanPackageArea}</span>
@@ -294,7 +294,7 @@
// 瀛楁鍚�: planNo, 涓枃鎻忚堪: 鎵规鍙�
// 瀛楁鍚�: orderId, 涓枃鎻忚堪: 璁㈠崟鍙�
- // 瀛楁鍚�: isKitting, 涓枃鎻忚堪: 鏄惁榻愬
+ // 瀛楁鍚�: isUnline, 涓枃鎻忚堪: 鏄惁榻愬
// 瀛楁鍚�: isUnline, 涓枃鎻忚堪: 鏄惁涓嬬嚎
// 瀛楁鍚�: unlineTime, 涓枃鎻忚堪: 涓嬬嚎鏃堕棿
// 瀛楁鍚�: unlinePerson, 涓枃鎻忚堪: 涓嬬嚎浜�
@@ -314,7 +314,7 @@
listItems1 += `<li>
<span>${item.info5}</span>
<span>${item.packageNum}</span>
- <span style="color: ${item.isKitting ? 'white' : '#ea6767'};">${item.isKitting ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
+ <span style="color: ${item.isUnline ? 'white' : '#ea6767'};">${item.isUnline ? '鏄�' : '鍚�'}</span> <!-- 鏄惁榻愬 -->
<span>${item.unLinePackageNum}</span>
<span>${item.allPackageArea}</span>
<span>${item.scanPackageArea}</span>
--
Gitblit v1.9.3