#平库转立库

zjj

2024-03-28 613a4f53f24672cc7e202f6f40a9d51bae904e40

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

@@ -52,6 +52,23 @@
        return R.ok();
    }

    @RequestMapping("/combLtoP/auth")
    @ManagerAuth(memo = "移库组托")
    public R combLtoP(@RequestBody CombParam combParam){
        mobileService.combLtoP(combParam, getUserId());
        return R.ok();
    }

    /**
     * 组托-批量
     */
    @RequestMapping("/comb/auth/batch")
    @ManagerAuth(memo = "组托-批量")
    public R combBatch(@RequestBody CombParam combParam){
        mobileService.combBatch(combParam, getUserId());
        return R.ok();
    }


    /**
     * 组托
@@ -126,8 +143,15 @@
     */
    @RequestMapping("/bill/query/auth")
    @ManagerAuth(memo = "根据通知单查询明细")
    public R billQuery(@RequestParam String billNo){
        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).isNull("zpallet"));
    public R billQuery(@RequestParam String billNo,
                       @RequestParam String mnemonic){
        EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
        if(mnemonic == "") {
            wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet");
        } else {
            wrapper.eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet").and().like("mnemonic",mnemonic);
        }
        List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
        List<CombBillQueryVo> vos = new ArrayList<>();
        if (!Cools.isEmpty(waitPakins)) {
            for (WaitPakin waitPakin : waitPakins) {