Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

3 天以前 d66bc1821a36fd9272292bfa9d9c0980359e9ae0

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

@@ -864,10 +864,6 @@
                }
            }

            locMast.setLocSts("R");
            if(!locMastService.updateById(locMast)){
                throw new CoolException("新增agv入库任务失败");
            }
            BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
            BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
            AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
@@ -881,6 +877,11 @@
            if(resultBind.getCode() != 200){
                throw new CoolException("agv入库绑定失败");
            }
            locMast.setBarcode(param.getBarcode());
            locMast.setLocSts("R");
            if(!locMastService.updateById(locMast)){
                throw new CoolException("新增agv入库任务失败");
            }
            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
        }
    }