123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -1,7 +1,9 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -11,6 +13,7 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -161,6 +164,13 @@
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/comb/2auth")
    @ManagerAuth(memo = "组托")
    public R comb2(@RequestBody CombParam combParam){
        mobileService.pikingToFull2(1);
        return R.ok(mobileService.pikingToFull2(3732));
    }

    @RequestMapping("/pack/get/auth")
@@ -409,7 +419,20 @@
    public synchronized R pickAuth(@RequestBody String barcode){
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
        return R.ok().add(wrkDetls);
        ArrayList<WrkDetl> resultwrkDetls = new ArrayList<>();
        for (WrkDetl wrkDetl : wrkDetls) {
            if (isJSON(wrkDetl.getOrderNo())) {
                JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
                    WrkDetl clone = wrkDetl.clone();
                    clone.setOrderNo(detlDto.getOrderNo());
                    clone.setAnfme(detlDto.getAnfme());
                    resultwrkDetls.add(clone);
                });
            } else {
                resultwrkDetls.add(wrkDetl);
            }
        }
        return R.ok().add(resultwrkDetls);
    }

    @RequestMapping("/order/search/orderNo/auth/v2")