From 2ee72e66359734c221379fbf8743f8d2c10a1d34 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期二, 23 一月 2024 09:15:58 +0800
Subject: [PATCH] change 合箱上线
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 8 +++++++-
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 1 -
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 745adeb..c127b87 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -1,7 +1,10 @@
package com.jcdm.main.bs.orderScheduling.controller;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.jcdm.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +54,10 @@
public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
{
// startPage();
- List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ List<BsOrderScheduling> list = new ArrayList<>();
+ if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){
+ list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ }
return getDataTable(list);
}
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index bab0cc4..7c57df7 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -74,7 +74,6 @@
title="宸ヨ壓鏂囦欢"
:visible.sync="dialogVisible"
width="70%"
- lock-scroll="false"
@close="closeMethod"
>
--
Gitblit v1.9.3