src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/WrkMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -121,6 +121,7 @@ List<WrkMast> selectWrkStsAndIoType(@Param("sour")Integer sour); List<WrkMast> selectWrkStsAndIoType0(@Param("sour")Integer sour); List<WrkMast> selectWrkStsAndIoType1(@Param("sour")Integer sour); Integer selectWrkStsAndIoType107Count(@Param("sour")Integer sour); WrkMast selectWorkingPakin(@Param("sourceStaNo")Integer sourceStaNo); WrkMast selectWorkingPakout(@Param("sourceStaNo")Integer sourceStaNo); src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1263,6 +1263,17 @@ continue; } /* * 100、200存在进行中的盘点任务,则不执行盘点任务 * */ if (wrkMast.getIoType().equals(107)){ Integer countPan = wrkMastMapper.selectWrkStsAndIoType107Count(wrkMast.getSourceStaNo()); if (countPan!=0){ News.error("MainServiceImpl locToCrnStn 1271行"+"盘点出库跳过,存在进行中可能堵塞任务数{}个",countPan); continue; } } // 获取堆垛机出库站信息 SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId()); StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo()); src/main/resources/application.yml
@@ -8,8 +8,8 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs # url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs # url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs username: sa # password: Zoneyung@zy56$ password: sa@123 src/main/resources/mapper/WrkMastMapper.xml
@@ -221,6 +221,26 @@ </select> <select id="selectWrkStsAndIoType107Count" resultType="java.lang.Integer"> select count (*) from dbo.asr_wrk_mast where 1=1 and ( <choose> <when test="sour < 200"> (wrk_sts > 11 and wrk_sts < 15 and source_sta_no < 200 and io_type > 101 and io_type < 110) or (wrk_sts < 3 and sta_no < 200 and io_type < 100 and io_type > 9 and io_type != 11 ) </when> <otherwise> (wrk_sts > 11 and wrk_sts < 15 and source_sta_no > 200 and io_type > 101 and io_type < 110) or (wrk_sts < 3 and sta_no > 200 and io_type < 100 and io_type > 9 and io_type != 11) </otherwise> </choose> ) </select> <select id="selectWrkStsAndIoType1" resultMap="BaseResultMap"> select * from dbo.asr_wrk_mast where 1=1 and wrk_sts>11 and io_type=101 <if test="sour > 200">