From 24ff0501f06c17d3de8d365a7bcdd7c802367151 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 17:04:58 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 13 ++++++++++++-
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 5 ++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 1011d48..5903a8b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -367,8 +367,19 @@
@RequestMapping(value = "/actual/shipment/order/report/auth")
@ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
public R actualShipmentOrder(@RequestParam String itemName) {
- Long userId = getUserId();
+ Long userId = null;
+ try {
+ userId = getUserId();
+ if (Cools.isEmpty(userId)) {
+ return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+ }
+ } catch (Exception e){
+ return R.error("鐢ㄦ埛寮傚父").add("鐢ㄦ埛寮傚父");
+ }
List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlService.selectOrderPakoutDetailVoListV1(itemName);
+ if (OrderPakoutDetailVoList.isEmpty()) {
+ return R.error("涓婃姤鏄庣粏涓虹┖锛侊紒锛�").add("涓婃姤鏄庣粏涓虹┖锛侊紒锛�");
+ }
List<String> boxList = new ArrayList<>();
List<String> rollList = new ArrayList<>();
for (OrderPakoutDetailVo orderDetl : OrderPakoutDetailVoList){
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index c0b867a..a9cabba 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -261,7 +261,8 @@
class="confirm-report-btn"
@click="showConfirmDialog"
:loading="reportLoading">
- 纭涓婃姤
+ <!-- 鐩存帴鍦ㄦā鏉夸腑鍒ゆ柇 -->
+ {{ settleA === 17 ? '鍐嶆涓婃姤' : '纭涓婃姤' }}
</el-button>
<el-button @click="closeDetailDialog">鍏抽棴</el-button>
</div>
@@ -295,6 +296,7 @@
currentRow: null,
// 瀛愯〃鍒嗛〉
detailCurrentPage: 1,
+ settleA: 1,
detailPageSize: 5,
detailTotal: 0,
// 鍔犺浇鐘舵��
@@ -640,6 +642,7 @@
this.currentRow = row;
this.detailDialogVisible = true;
this.detailCurrentPage = 1;
+ this.settleA = row.settle;
this.getTableDataB(row.itemName);
},
--
Gitblit v1.9.1