From 1236197ab939a618b82b9e9ea6fddf94b8740b58 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 十月 2025 10:36:09 +0800
Subject: [PATCH] 对接
---
src/main/resources/mapper/OrderDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 ++++-
src/main/java/com/zy/asrs/controller/MobileController.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 ++++++++++++--
4 files changed, 18 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 37835f9..b560a5e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -279,6 +279,7 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
+ log.info("缁勬墭锛�"+JSONObject.toJSONString(combParam));
if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 43f2269..48e9a4e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -400,7 +400,10 @@
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), null);
+ if (Cools.isEmpty(orderDetl)){
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
}
if (Cools.isEmpty(codeDataParam.getQuality())) {
throw new CoolException("鏉＄爜鏈繑鍥炶川閲忕姸鎬�");
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index da1e506..833b36a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -80,7 +80,12 @@
boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")){
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍏�)", Boolean.TRUE);
+ }else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -231,7 +236,12 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ DocType docType;
+ if (param.getOrderType().equals("璋冩嫧鍗�")){
+ docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍑�)", Boolean.FALSE);
+ }else {
+ docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ }
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 29f7523..bf73911 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -53,7 +53,7 @@
</resultMap>
<select id="selectItem" resultMap="BaseResultMap">
- select * from man_order_detl
+ select top 1 * from man_order_detl
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
--
Gitblit v1.9.1