From 827d0a1133cbb738471f44a4eb58aba171c6323d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 13 十月 2025 09:20:30 +0800
Subject: [PATCH] 对接
---
src/main/resources/mapper/asrs/MatMapper.xml | 4 ++++
src/main/java/com/zy/third/task/handler/OrderHandler.java | 4 ++--
src/main/java/com/zy/third/task/OrderScheduler.java | 4 ++--
src/main/java/com/zy/asrs/mapper/MatMapper.java | 2 ++
src/main/resources/mapper/asrs/OrderMapper.xml | 2 --
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/service/MatService.java | 2 ++
7 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 056df9f..d5a6687 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -17,4 +17,6 @@
Mat selectByMatnr(@Param("matnr")String matnr);
+ Mat selectBySku(@Param("sku")String sku);
+
}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index faa1370..a643044 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -10,4 +10,6 @@
Mat selectByMatnr(String matnr);
+ Mat selectBySku(String sku);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 0165023..7be7345 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -21,5 +21,9 @@
return this.baseMapper.selectByMatnr(matnr);
}
+ @Override
+ public Mat selectBySku(String matnr) {
+ return this.baseMapper.selectBySku(matnr);
+ }
}
diff --git a/src/main/java/com/zy/third/task/OrderScheduler.java b/src/main/java/com/zy/third/task/OrderScheduler.java
index 5b70d32..77e3c3d 100644
--- a/src/main/java/com/zy/third/task/OrderScheduler.java
+++ b/src/main/java/com/zy/third/task/OrderScheduler.java
@@ -32,7 +32,7 @@
/**
* 璇诲彇鍏ュ簱鍗曟嵁
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
public void readInOrder() {
log.info("璇诲彇鍏ュ簱鍗曟嵁");
List<String> orderNos = exdInstockSourceMapper.listOrderNo();
@@ -65,7 +65,7 @@
/**
* 璇诲彇鍑哄簱鍗曟嵁
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
public void readOutOrder() {
log.info("璇诲彇鍑哄簱鍗曟嵁");
List<String> orderNos = exdOutstockSourceMapper.listOrderNo();
diff --git a/src/main/java/com/zy/third/task/handler/OrderHandler.java b/src/main/java/com/zy/third/task/handler/OrderHandler.java
index 1a0f615..27ec3ff 100644
--- a/src/main/java/com/zy/third/task/handler/OrderHandler.java
+++ b/src/main/java/com/zy/third/task/handler/OrderHandler.java
@@ -117,7 +117,7 @@
}
}
for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ Mat mat = matService.selectBySku(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
@@ -210,7 +210,7 @@
}
}
for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ Mat mat = matService.selectBySku(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
diff --git a/src/main/resources/mapper/asrs/MatMapper.xml b/src/main/resources/mapper/asrs/MatMapper.xml
index a244da7..d573b4b 100644
--- a/src/main/resources/mapper/asrs/MatMapper.xml
+++ b/src/main/resources/mapper/asrs/MatMapper.xml
@@ -80,4 +80,8 @@
<select id="selectByMatnr" resultMap="BaseResultMap">
select top 1 * from man_mat where 1=1 and matnr = #{matnr}
</select>
+
+ <select id="selectBySku" resultMap="BaseResultMap">
+ select top 1 * from man_mat where 1=1 and sku = #{sku}
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index 7f88f3c..db8816d 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -59,8 +59,6 @@
where 1=1
and settle = 4
and status = 1
- and doc_type!=18
- and doc_type!=19
order by create_time asc
</select>
--
Gitblit v1.9.1