#

whycq

2024-09-03 ead73e3697fdb4e2a3de786a82393cd28a6c0e01

#

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

@@ -373,9 +373,7 @@



        if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
                && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
                || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
        if((!Cools.eq("F",agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){

            return R.error("库位状态不为F或者D，无法维护");
@@ -428,7 +426,13 @@
        }

        if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
            return R.ok("该库位与货架库存一致，无需维护");
            //agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
            //agvLocMastService.updateById(agvLocMastByContainerCode);

            agvLocMastByLocNo.setBarcode(containerCode);
            agvLocMastService.updateById(agvLocMastByLocNo);
            //return R.ok("该库位与货架库存一致，无需维护");
            return R.ok("维护成功");
        }



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

@@ -59,7 +59,7 @@

    @GetMapping("/doc/type/list")
    @Transactional
    @ManagerAuth(memo = "单据类型")
    @ManagerAuth(memo = "入库单据类型")
    @Synchronized
    public R docTypeList(){
        List<DocType> result = new ArrayList<>();
@@ -77,6 +77,28 @@
        return R.ok().add(result);
    }

    @GetMapping("/doc/type/out/list")
    @Transactional
    @ManagerAuth(memo = "出库单据类型")
    @Synchronized
    public R docTypeOutList(){
        List<DocType> result = new ArrayList<>();
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(18L);
        unDocIds.add(31L);
        unDocIds.add(33L);
        unDocIds.add(34L);
        unDocIds.add(35L);
        unDocIds.add(37L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                result.add(pakin);
            }
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo){

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

@@ -98,6 +98,56 @@
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/orderDetl/pakout/list/authV193")
    @ManagerAuth
    public R pakoutList193(@RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit,
                         @RequestParam(required = false)String orderByField,
                         @RequestParam(required = false)String orderByType,
                         @RequestParam(required = false)Long docType,
                         @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        param.remove("docType");
        excludeTrash(param);
        convertLike(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();

        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(18L);
        unDocIds.add(31L);
        unDocIds.add(33L);
        unDocIds.add(34L);
        unDocIds.add(35L);
        unDocIds.add(37L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                docIds.add(pakin.getDocId());
            }
        }

        if (docIds.size() > 0) {
            if (docType > 0) {
                wrapper.in("source",docType);
            } else {
                wrapper.in("source",docIds);
            }

        } else {
            wrapper.in("source",0);
        }
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }

        return R.ok(page);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/authV3")
    @ManagerAuth
    public R pakoutList3(@RequestParam(defaultValue = "1")Integer curr,