#

whycq

2024-06-13 c28c70ac1507df7a9e17e97474fd7d2c368fc673

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

@@ -191,6 +191,7 @@

        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);


//        wrapper.eq("orderNo",orderNo);

        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
@@ -205,7 +206,12 @@
            if (Cools.isEmpty(floor)) {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
            } else {
                agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                // 如果是加工单 只在 lev1 = 1 查库存
                if ("JG".equals(orderNo.substring(0,2))) {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                } else {
                    agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
                }
            }

            if (Cools.isEmpty(agvLocMast)) continue;
@@ -542,6 +548,15 @@
        return R.ok();
    }

    @PostMapping("/hand/control/processed")
    @Transactional
    @ManagerAuth(memo = "确认加工完成")
    @Synchronized
    public R processed(@RequestBody AgvMobileStartPakin param){
        agvMobileService.processed(param, getUserId());
        return R.ok();
    }

    public static void main(String[] args) {
        List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
        List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();