From 2f73fee4e429bd57df092ab185dfee2e1306ff09 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 14 四月 2025 12:37:39 +0800
Subject: [PATCH] 单据增加业务号
---
src/main/java/com/zy/asrs/controller/MobileController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ec8bded..bc16861 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -18,7 +17,6 @@
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.license.AbstractServerInfos;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -433,7 +430,10 @@
public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
if (temp1 == null) {
- throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
+ temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", billNo));
+ if (temp1 == null) {
+ throw new CoolException("璇ヨ鍗曚笉瀛樺湪");
+ }
}
List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).last("and anfme > work_qty"));
if (waitMatins == null || waitMatins.isEmpty()) {
--
Gitblit v1.9.1