关闭与erp的对接

zhang

6 天以前 63676447b730800bc7ba3df060bf867713db98f4

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

@@ -232,12 +232,12 @@
                    String locSts = "O";
                    if (byDevNo != null) {
                        assert log != null;
                        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);
                            }
                        }
//                        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());
@@ -255,7 +255,7 @@

            if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {
                //更新库存明细
                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(), agvWrkMast.getAppeUser());
                //修改源库位状态为O
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
            } else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {