#

lsh

2023-03-10 785aeaf363da16440554d67e9a3ded6ecf157ad4

#

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

@@ -94,4 +94,5 @@

    List<WrkMast> selectAll(@Param("staNo")Integer staNo);

    WrkMast selectAllC();
}

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

@@ -725,14 +725,14 @@
                        .eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
                for (LocMast locMast1:locMasts){
                    if (locMast1.getRow1()>locMast.getRow1()){
                        if (!locMast1.getLocSts().equals("F")){
                        if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
                            if (!locMast1.getLocSts().equals("X")){
                                sign=true;
                                break;
                            }
                        }
                    }else if (locMast1.getRow1()<locMast.getRow1()){
                        if (locMast1.getLocSts().equals("F")){
                        if (locMast1.getLocSts().equals("F") || locMast1.getLocSts().equals("D")){
                            News.error("当前工作档目标库位所在排前边存在货物！", wrkMast.getWrkNo());
                            sign=true;
                            break;
@@ -744,13 +744,13 @@
                        .eq("bay1",locMast.getBay1()).eq("lev1",locMast.getLev1()));
                for (LocMast locMast1:locMasts){
                    if (locMast1.getRow1()>locMast.getRow1()){
                        if (locMast1.getLocSts().equals("F")){
                        if (locMast1.getLocSts().equals("F") || locMast1.getLocSts().equals("D")){
                            News.error("当前工作档目标库位所在排前边存在货物！", wrkMast.getWrkNo());
                            sign=true;
                            break;
                        }
                    }else if (locMast1.getRow1()<locMast.getRow1()){
                        if (!locMast1.getLocSts().equals("F")){
                        if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D")){
                            if (!locMast1.getLocSts().equals("X")){
                                sign=true;
                                break;
@@ -2585,6 +2585,9 @@
     */
    @SuppressWarnings("serial")
    public synchronized void loopSteCharge() {
        if (!Cools.isEmpty(wrkMastMapper.selectAllC())){
            return;
        }
        if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) {
            return;
        }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -196,6 +196,13 @@
        and source_sta_no=#{staNo}
    </select>

    <select id="selectAllC" resultMap="BaseResultMap">
        select top 1 *
        from dbo.asr_wrk_mast where 1=1
        and wrk_sts!=1 and wrk_sts!=11
        and wrk_sts!=18 and wrk_sts!=9 and wrk_sts &lt; 20 and io_type!=11
    </select>

    <select id="selectPakinWorkingByGroupLoc" resultMap="BaseResultMap">
        select top 1 *
        from dbo.asr_wrk_mast