1

ZY

2025-03-31 9ed4cb53a2c643b879f993537f5a2793fba56ba1

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -180,8 +180,13 @@

            //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
            if (agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) {
                //修改出库站点状态
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getLocNo());
                if (byDevNo != null) {
                    log.info("出库任务进入站点===>>站点码：{}，站点状态{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                    //修改出库站点状态
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());

                }
            }
            //出库任务 110.空板出库
            if (agvWrkMast.getIoType() == 110) {
@@ -219,22 +224,44 @@
                case 10:
                    // 拣料入库任务
                case 53:
                    // 站点退回
                case 58:
                    // 盘点再入库
                case 57:
                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    String locSts = "O";
                    if (byDevNo != null) {
                        assert log != null;
                        log.info("料架离开时当前站点状态:{}", byDevNo.getLocSts());
                        if (("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts()))) {
//                        if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
//                            AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", agvWrkMast.getBarcode()));
//                            if (!Cools.isEmpty(agvBasDevp) && agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getDevNo().equals(byDevNo.getDevNo())) {
//                                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(), locSts, "", null);
//                            }
//                        }
                        log.info("料架离开时当前站点状态:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
                            log.info("料架离开时当前站点状态保持不变1:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                            locSts = byDevNo.getLocSts();
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, byDevNo.getBarcode(), null);
                        } else {
                            log.info("料架离开时当前站点状态保持不变2:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());
                            locSts = "O";
                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                        }

                    }
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                    break;
            }

            if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
                //更新库存明细
                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                //修改源库位状态为O
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
            } else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                //修改源库位状态为O
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
            }
            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
            //    //修改源站点状态为O.空，以及解绑托盘条码
            //    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);