#

野心家

2023-09-13 9b4de84e744b2f76a24103e791086c647c1c3027

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

@@ -72,7 +72,7 @@
                    TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                            .eq("loc_no",locMast.getLocNo())
                            .eq("barcode",locDetl.getMatnr())
                            .eq("status",4)
                            .eq("status",4)//完成测试
                    );
                    if (!Cools.isEmpty(testMast)){
                        if (testMast.getStatus()==4){
@@ -82,7 +82,7 @@
                                targetLocNo=locMastService.queryFreeLocMast(1,(short)4);
                            }
                            if (targetLocNo != null){
                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt("9935"));
                                //4.测试完成上报
                                CombParam combParam = new CombParam();
                                combParam.setPackNo(locDetl.getMatnr());
@@ -146,7 +146,7 @@
                                    targetLocNo=locMastService.queryFreeLocMast(1,(short)2);
                                }
                                if (targetLocNo != null){
                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)9935);
                                    sign=true;
                                }else {
                                    log.error("测试完成自动移库--->没有空库位!");
@@ -230,7 +230,7 @@
                wrkMast.setIoPri(13D); // 优先级：13
                wrkMast.setCrnNo(1);
                wrkMast.setSourceStaNo(203); // 源站
                wrkMast.setStaNo(205); // 目标站  2号堆垛机入库站
                wrkMast.setStaNo(206); // 目标站  2号堆垛机入库站
                wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                wrkMast.setFullPlt("Y"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
@@ -261,14 +261,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;