#

LSH

2024-03-11 1099b9b7414f0e28fe14dd9a43df6166fed5366b

#

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

@@ -17,6 +17,7 @@
    List<WrkMast> selectToBeCompleteData202();

    List<WrkMast> selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData2();

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

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

@@ -13,6 +13,7 @@
    List<WrkMast> selectToBeCompleteData202();

    List<WrkMast> selectToBeHistoryData();
    List<WrkMast> selectToBeHistoryData2();

    WrkMast selectByBarcode(String barcode);


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

@@ -36,6 +36,11 @@
    }

    @Override
    public List<WrkMast> selectToBeHistoryData2() {
        return this.baseMapper.selectToBeHistoryData2();
    }

    @Override
    public WrkMast selectByBarcode(String barcode) {
        List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (Cools.isEmpty(wrkMasts)) {

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

@@ -44,6 +44,18 @@
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute3(){
        List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData2();
        if (wrkMasts.isEmpty()) {
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            wrkMast.setOveMk("Y");
            wrkMastService.updateById(wrkMast);
        }
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){
        List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>().eq("wrk_sts", 3));
        if (Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()==0) {

 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java

@@ -45,6 +45,14 @@
    @Autowired
    private BasCrnpService basCrnpService;

    public static final List<Integer> rows1 = new ArrayList<Integer>() {{
        add(1);add(5);add(9);add(13);add(17);add(21);
    }};

    public static final List<Integer> rows2 = new ArrayList<Integer>() {{
        add(4);add(8);add(12);add(16);add(20);add(24);
    }};

    public ReturnT<String> start(Integer staNo) {
        try {
            if (!Cools.isEmpty(wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", staNo)))){
@@ -72,11 +80,30 @@
                sign = true;
                // 获取库位
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",crnNo));

                if (Cools.isEmpty(locMast)) {
//                    throw new CoolException("库中无空板！！！");
                    sign=false;
                }
                if (sign){
                    if (rows1.contains(locMast.getRow1())){
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("row1", locMast.getRow1() + 1)
                                .eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()));
                        if (!Cools.isEmpty(locMast1)) {
                            locMast = locMast1;
                        }
                    }else if (rows2.contains(locMast.getRow1())){
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("row1", locMast.getRow1() - 1)
                                .eq("bay1", locMast.getBay1()).eq("lev1", locMast.getLev1()));
                        if (!Cools.isEmpty(locMast1)) {
                            locMast = locMast1;
                        }
                    }
                }
                if (sign && Cools.isEmpty(locMast)) {
//                    throw new CoolException("库中无空板！！！");
                    sign=false;
                }

                if (sign && !locMast.getLocSts().equals("D")){
//                    throw new CoolException("所选库位存在状态不为D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
                    sign=false;
@@ -88,11 +115,18 @@
                            .eq("stn_no", staNo)
                            .eq("crn_no", locMast.getCrnNo());
                    StaDesc staDesc = staDescService.selectOne(wrapper);
                    Integer sourceStaNo = staDesc.getCrnStn();
                    if (Cools.isEmpty(sourceStaNo)) {
                    if (Cools.isEmpty(staDesc)) {
//                    throw new CoolException("检索源站失败");
                        sign = false;
                    }
                    Integer sourceStaNo = null;
                    if (sign){
                        sourceStaNo = staDesc.getCrnStn();
                        if (Cools.isEmpty(sourceStaNo)) {
//                    throw new CoolException("检索源站失败");
                            sign = false;
                        }
                    }
                    if (sign){
                        Date now = new Date();
                        // 保存工作档

 src/main/resources/mapper/WrkMastMapper.xml

@@ -82,4 +82,11 @@
        order by io_time,wrk_no asc
    </select>

    <select id="selectToBeHistoryData2" resultMap="BaseResultMap">
        select * from asr_wrk_mast
        where
        wrk_sts=15 and ove_mk='N' and io_type = 110 and sta_no = 213 and wrk_no in (select wrk_no from asr_bas_devp where dev_no = 213)
        order by io_time,wrk_no asc
    </select>

</mapper>