#

lsh

2023-12-20 cd280ead41b98ee60154038e36d9b83cc25e7d16

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

@@ -43,6 +43,8 @@
    private CommonService commonService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private BasCrnpService basCrnpService;

    @Value("${channel.equipmentRow}")
    private Integer equipmentRow;  //测试库位所在排号
@@ -69,6 +71,10 @@
            if (!Cools.isEmpty(locMasts)){
                for (LocMast locMast:locMasts){
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                    if (Cools.isEmpty(locDetl)){
                        log.error("测试失败（NG）移库==>库存明细查询失败！库位号："+locMast.getLocNo());
                        continue;
                    }
                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                            .eq("loc_no",locMast.getLocNo())
                            .eq("barcode",locDetl.getMatnr())
@@ -104,9 +110,10 @@
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
            log.error(""+e);
//            e.printStackTrace();
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//            return FAIL.setMsg(e.getMessage());
        }

        //测试成功 出库、移库
@@ -121,6 +128,10 @@
            if (!Cools.isEmpty(locMasts2)){
                for (LocMast locMast:locMasts2){
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                    if (Cools.isEmpty(locDetl)){
                        log.error("测试成功 出库、移库==>库存明细查询失败！库位号："+locMast.getLocNo());
                        continue;
                    }
                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                            .eq("loc_no",locMast.getLocNo())
                            .eq("barcode",locDetl.getMatnr())
@@ -129,10 +140,20 @@
                    boolean sign=false;
                    if (!Cools.isEmpty(testMast)){
                        if (testMast.getStatus()==4){
                            boolean signCrn1 = basCrnpService.checkSiteError(1, false);
                            if (!signCrn1){
                                log.error("测试完成自动移库--->1号堆垛机不可出库!");
                                break;
                            }
                            //移库开始，查询目标库位
                            LocMast targetLocNo = locMastService.queryFreeLocMast(4,(short)2);
                            if (Cools.isEmpty(targetLocNo)){
                                targetLocNo=locMastService.queryFreeLocMast(3,(short)2);
                            }
                            boolean signCrn2 = basCrnpService.checkSiteError(2, true);
                            if (!signCrn2){
                                targetLocNo = null;
                                log.error("测试完成自动移库--->2号堆垛机不可入库! 开始查找1号堆垛机");
                            }
                            if (targetLocNo != null){
                                //生成出库任务
@@ -140,6 +161,11 @@
                                    sign=true;
                                }
                            }else {
                                signCrn1 = basCrnpService.checkSiteError(1, true);
                                if (!signCrn1){
                                    log.error("测试完成自动移库--->1号堆垛机不可入库!");
                                    break;
                                }
                                //3\4排满  向2排移库，查询目标库位
                                targetLocNo = locMastService.queryFreeLocMast(2,(short)2);
                                if (Cools.isEmpty(targetLocNo)){
@@ -173,9 +199,10 @@
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
            log.error(""+e);
//            e.printStackTrace();
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//            return FAIL.setMsg(e.getMessage());
        }

        //测试有空库位 移库
@@ -185,9 +212,15 @@
                    .eq("pack_status", 0)
                    .eq("loc_type1", (short) 3)
                    .eq("fire_status",0)
                    .orderBy("io_time",true)
            );
            if (!Cools.isEmpty(locMasts3)){
                for (LocMast locMast:locMasts3){
                    boolean signCrn1 = basCrnpService.checkSiteError(1, true);
                    if (!signCrn1){
                        log.error("向测试库位移库失败---->1号堆垛机不可用!");
                        break;
                    }
                    //移库开始，查询目标库位
                    LocMast targetLocNo = locMastService.queryFreeLocMast(equipmentRow,(short)1);
                    if (targetLocNo != null){
@@ -198,9 +231,10 @@
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());
            log.error(""+e);
//            e.printStackTrace();
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//            return FAIL.setMsg(e.getMessage());
        }
        return SUCCESS;
    }
@@ -261,14 +295,6 @@
                    locMast.setLocSts("R");
                    locMast.setModiTime(now);
//                    locMast.setPackStatus(5); //5:开始静置

                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkDetl.getMatnr());
                    combParam.setLocNo(locMast.getLocNo());
                    combParam.setPackSts(locMast.getPackStatus());
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

                    if (!locMastService.updateById(locMast)) {
                        log.error("预约库位状态失败，库位号："+locMast.getLocNo());
                        return false;