From 08f58a6d5a2038117a1f215772f095a6e267ad9b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 五月 2025 11:05:31 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 2
src/main/java/com/zy/asrs/controller/OrderController.java | 10 ++++-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 26 ++++++------
src/main/webapp/views/order/out.html | 9 ++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 24 ++++++------
5 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index a89e6fa..d769423 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -183,12 +183,18 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo
+ , @RequestParam(required = false) Integer settle) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("status", 1);
+ if (!Cools.isEmpty(settle)) {
+ wrapper.eq("settle", settle);
+ }else {
+ wrapper.le("settle", 2);
+ }
+ wrapper.eq("status", 1);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 1ce05c5..572840b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -42,18 +42,18 @@
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
-// if (!Cools.isEmpty(wrkDetls)) {
-// Iterator<WrkDetl> iterator = wrkDetls.iterator();
-// while (iterator.hasNext()) {
-// WrkDetl wrkDetl = iterator.next();
-// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// orderService.checkComplete(wrkDetl.getOrderNo());
-// iterator.remove();
-// }
-// }
-// }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ if (!Cools.isEmpty(wrkDetls)) {
+ Iterator<WrkDetl> iterator = wrkDetls.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ orderService.checkComplete(wrkDetl.getOrderNo());
+ iterator.remove();
+ }
+ }
+ }
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c802240..29cf116 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -463,19 +463,19 @@
- Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
- if (finsihed) {
- Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
- if (mastFinished) {
- Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
- if (!Cools.isEmpty(order)) {
- order.setMemo("0");//鐘舵�佽浆鎹㈡垚寮�濮嬩笅鎺�
- orderService.updateById(order);
- orderService.updateSettle(order.getId(),4L,1L);
-
- }
- }
- }
+// Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
+// if (finsihed) {
+// Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
+// if (mastFinished) {
+// Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
+// if (!Cools.isEmpty(order)) {
+// order.setMemo("0");//鐘舵�佽浆鎹㈡垚寮�濮嬩笅鎺�
+// orderService.updateById(order);
+// orderService.updateSettle(order.getId(),4L,1L);
+//
+// }
+// }
+// }
break;
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index e2c662b..6986656 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -87,7 +87,7 @@
<sql id="pakOutPageCondition">
<if test="order_id!=null and order_id!='' ">
- and mod.order_id like '%' + #{order_id} + '%'
+ and mod.order_id = #{order_id}
</if>
<if test="matnr!=null and matnr!='' ">
and mod.matnr like '%' + #{matnr} + '%'
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 4e7abfe..3afc2b4 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -75,6 +75,15 @@
<input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" autocomplete="off"/>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="settle">
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鐞�</option>
+ <option value="2">浣滀笟涓�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
--
Gitblit v1.9.1