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

Junjie

2023-09-20 c8ec0494e03be47ec0f1b3a89ad5e0a004bd7501

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

@@ -47,6 +47,8 @@
    private BasDevpService basDevpService;
    @Autowired
    private PackService packService;
    @Autowired
    private ManLocDetlService manLocDetlService;

    // 组托 ----------------------------------------------------------------------------------------------------

@@ -88,6 +90,8 @@
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setCsocode(orderDetl.getColor());
                        combMat.setIsoseq(orderDetl.getOrigin());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -318,5 +322,32 @@
        return R.ok("盘点成功");
    }

    /*
    平库 库位推荐
     */
    @RequestMapping("/node/recommend/loc")
    @ManagerAuth(memo = "库位推荐")
    public R recommendNodeLoc(){


        return R.ok();
    }

    /*
    平库 订单上架
     */
    @RequestMapping("/node/puttway")
    @ManagerAuth(memo = "订单上架")
    public R putway(@RequestBody HashMap<String,String> params){
        String zpallet = params.get("zpallet");
        String locNo = params.get("locNo");

        mobileService.nodePutway(zpallet,locNo,getUser());


        return R.ok();
    }



}