From e99caac6b8d8af3a2deb98ab131e9c5305fe4eff Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 10 十月 2022 10:16:06 +0800 Subject: [PATCH] # --- src/main/resources/mapper/WrkDetlMapper.xml | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 ++++++++++++++++++--- src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 ++++ src/main/resources/mapper/WrkMastMapper.xml | 22 +++++++++++++++++++++- src/main/resources/application.yml | 2 +- 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index f105ded..44e4e48 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -77,4 +77,8 @@ @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}") int setSteEmpty(Integer wrkNo); + WrkMast selectPakin(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo); + + WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo); + } 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 9768a5b..595c3d6 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -314,9 +314,9 @@ try { // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。 - if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) { - throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。澶辫触"); - } +// if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) { +// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。澶辫触"); +// } // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) { throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�"); @@ -527,6 +527,12 @@ continue; } + // 杩囨护 + if (null != wrkMastMapper.selectPakout(slave.getId(), null)) { + log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo()); + continue; + } + // 缃《浠诲姟 wrkMast.setIoPri((double) 9999); wrkMastMapper.updateById(wrkMast); @@ -539,6 +545,9 @@ if (steNo != null) { // 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣 if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) { +// if (null != wrkMastMapper.selectPakin(slave.getId(), steNo)) { +// continue; +// } this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo()); } // 灏忚溅鎼蛋 @@ -702,6 +711,12 @@ continue; } + // 杩囨护 + if (null != wrkMastMapper.selectPakin(slave.getId(), null)) { + log.error("{}鍑哄簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍏ュ簱涓换鍔�!", wrkMast.getWrkNo()); + continue; + } + // 缃《浠诲姟 wrkMast.setIoPri((double) 9999); wrkMastMapper.updateById(wrkMast); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 63008e2..551ae7f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -36,7 +36,7 @@ enable: false wms: - url: localhost:8080/bfwms + url: 10.10.10.100:8080/bfwms # 涓嬩綅鏈洪厤缃� wcs-slave: diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 5f5fa79..e33df2d 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -48,7 +48,7 @@ </resultMap> <select id="findByWorkNo" resultMap="BaseResultMap"> - select wrk_no, matnr, maktx, qty from asr_wrk_detl where 1=1 and wrk_no = #{workNo} + select wrk_no, matnr, maktx, anfme from asr_wrk_detl where 1=1 and wrk_no = #{workNo} </select> </mapper> diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index eabbea3..1e7c71c 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -90,7 +90,7 @@ </select> <select id="selectPakInStep23456" resultMap="BaseResultMap"> - select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6,7, 8) and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC + select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6,7,8) and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC </select> <select id="selectPakInStep45" resultMap="BaseResultMap"> @@ -129,4 +129,24 @@ select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=7 or wrk_sts=16) and crn_no=#{crnNo} order by io_time,wrk_no </select> + <select id="selectPakin" resultMap="BaseResultMap"> + select top 1 * from dbo.asr_wrk_mast + where 1=1 + and wrk_sts in (3,4,5,6,7,8) + and crn_no=#{crnNo} + <if test="steNo != null"> + and ste_no = #{steNo} + </if> + </select> + + <select id="selectPakout" resultMap="BaseResultMap"> + select top 1 * from dbo.asr_wrk_mast + where 1=1 + and wrk_sts in (12,13,14,15,16) + and crn_no=#{crnNo} + <if test="steNo != null"> + and ste_no = #{steNo} + </if> + </select> + </mapper> -- Gitblit v1.9.1