From 54e371c10fdb3640b5ac5e4d5ea9ace537f27174 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 15:18:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++++++++++++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 ++++
src/main/resources/mapper/WrkMastMapper.xml | 6 +++++-
src/main/java/com/zy/core/MainProcess.java | 3 +++
4 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 55a5ded..26517b8 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -87,4 +87,8 @@
* @return
*/
WrkMast selectDevWorking(@Param("crnNo")Integer crnNo);
+
+
+ List<WrkMast> selectPick();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 07a235f..d2e614e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -87,6 +87,7 @@
private BasErrLogService basErrLogService;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+
@Value("${wms.url}")
private String wmsUrl;
@Value("${crnBackHp.enable}")
@@ -1718,4 +1719,19 @@
}
+
+ public void outOfDevp() {
+ List<WrkMast> wrkMasts = wrkMastMapper.selectPick();
+ for (WrkMast wrkMast : wrkMasts) {
+ if (basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo())) == 0) {
+ wrkMast.setCtnNo("Y");
+ if (wrkMastMapper.updateById(wrkMast) == 0) {
+ log.error("淇敼{}宸ヤ綔妗ｅけ璐ワ紝ctn_no", wrkMast.getWrkNo());
+ }
+ }
+
+ }
+ }
+
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index d12d9a3..c5b90fb 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -77,6 +77,9 @@
// }
// look = !look;
+
+ mainService.outOfDevp();
+
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 96c7603..55424bc 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,7 @@
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
+ select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
</select>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -148,4 +148,8 @@
select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
+ <select id="selectPick" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
+ </select>
+
</mapper>
--
Gitblit v1.9.1