# 528

whycq

2024-05-28 e62ee0fb93bdb95c462c963e88781ed940da648e

# 528

 src/main/java/com/zy/asrs/service/AgvWaitPakinService.java

@@ -13,5 +13,6 @@

    public List<AgvWaitPakin> selectByContainerCode(String containerCode);

    public List<AgvWaitPakin> selectByContainerCode2(String containerCode);

}

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

@@ -36,4 +36,9 @@
    public List<AgvWaitPakin> selectByContainerCode(String containerCode) {
        return this.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode).eq("io_status","N"));
    }

    @Override
    public List<AgvWaitPakin> selectByContainerCode2(String containerCode) {
        return this.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode));
    }
}

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

@@ -600,6 +600,14 @@
            String locNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
            if (wrkMast.getIoType() == 1) {
                List<AgvWaitPakin> agvWaitPakins = agvWaitPakinService.selectByContainerCode2(wrkMast.getBarcode());
                for (AgvWaitPakin agvWaitPakin : agvWaitPakins) {
                    if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSupp()))) {
                        throw new CoolException("入库通知档取消失败");
                    }
                }
            }


            // 移库取消
@@ -649,7 +657,12 @@
                agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            }
            if (wrkMast.getIoType() == 109){
                agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
                if (Cools.isEmpty(wrkMast.getLocNo())) {

                } else {
                    agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
                }

            }else {
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            }

 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java

@@ -50,6 +50,7 @@
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 22)
                .andNew().eq("io_type",108)
                        .eq("crn_no",2)
                );
        if (agvWrkMastList.isEmpty()) {
            return;
@@ -60,6 +61,22 @@

    }

    @Scheduled(cron = "0/2 * * * * ? ")
    private void execute5(){
        List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
                .eq("wrk_sts", 22)
                .andNew().eq("io_type",108)
                .eq("crn_no",3)
        );
        if (agvWrkMastList.isEmpty()) {
            return;
        }
        for (AgvWrkMast agvWrkMast : agvWrkMastList) {
            ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
        }

    }

    // 调拨出库
    @Scheduled(cron = "0/2 * * * * ? ")
    private void execute3(){

 src/main/resources/AgvLocDetlMapper.xml

File was deleted

 src/main/resources/mapper/AgvLocMastMapper.xml

@@ -41,7 +41,7 @@

    </resultMap>

    <select id="queryFreeLocMast" resultMap="BaseResultMap">
    <select id="queryFreeLocMast33" resultMap="BaseResultMap">
        select
        *
        from asr_loc_mast