#

whycq

2022-12-12 8a51096595d3ccba21bc59cfc6a60830abdadfd6

#

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -55,6 +55,8 @@

    WrkMast selectWorking(@Param("crnNo")Integer crnNo);

    List<WrkMast> selectWorkings();

    // work log -------------------------------------------------------
    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1910,7 +1910,11 @@
                            break;
                        case 402://1F
                            if (pakout != null) {
                                if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) {
                                if ((pakout.getIoType()==103 || pakout.getIoType()==107)&& pakout.getWrkSts()==14 && devpThread.getStation().get(inSta.getStaNo()-1).getWorkNo()==0){
                                }else if ((pakout.getIoType()==103 || pakout.getIoType()==107)&& pakout.getWrkSts()==14 && devpThread.getStation().get(inSta.getStaNo()-1).getWorkNo()!=0) {
                                    // 入库模式
                                    devpThread.ioModeOf4F = IoModeType.PAKIN_MODE;
                                }else if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) {
                                    // 出库切换中
                                    devpThread.ioModeOf4F = IoModeType.PAKOUT_BOOTING;
                                    WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
@@ -1922,8 +1926,12 @@
                                    }
                                }
                            } else {
                                // 入库模式
                                devpThread.ioModeOf4F = IoModeType.PAKIN_MODE;
                                List<WrkMast> wrkMasts = wrkMastMapper.selectWorkings();
                                if (wrkMasts.size()==0){
                                    // 入库模式
                                    devpThread.ioModeOf4F = IoModeType.PAKIN_MODE;
                                }else {
                                }
                            }
                            break;
                    }

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
    url: jdbc:sqlserver://10.10.10.210:1433;databasename=hylyasrs
    username: sa
    password: sa@123
  mvc:
@@ -34,7 +34,7 @@
  enable: false

wms:
  url: 127.0.0.1:8080/lywms
  url: 127.0.0.1:8081/lywms

# 下位机配置
wcs-slave:

 src/main/resources/mapper/WrkMastMapper.xml

@@ -119,6 +119,10 @@
        select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
    </select>

    <select id="selectWorkings" resultMap="BaseResultMap">
        select * from dbo.asr_wrk_mast where 1=1 and wrk_sts=12 and (io_type=104 or io_type=107 or io_type=110)
    </select>

    <select id="selectWorking" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
    </select>