13

zhang

1 天以前 1c0dbad152362ac704a27ecfc5b5d08247385d87

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

@@ -9,7 +9,10 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.ForwardAGVTaskParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
@@ -52,8 +55,6 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private PackService packService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
@@ -218,13 +219,13 @@
        if (Cools.isEmpty(orderNo)) {
            orderNo = null;
        }
        List<Order> orders = orderService.selectorderNoL(orderNo);
        List<OrderPakin> orders = orderService.selectorderNoL(orderNo);
        if (Cools.isEmpty(orders)) {
            return R.ok();
        }
        LinkedList<CombParam> combParams = new LinkedList<>();
        if (!Cools.isEmpty(orders)) {
            for (Order order : orders) {
            for (OrderPakin order : orders) {
                CombParam combParam = new CombParam();
                if (order == null) {
                    continue;
@@ -236,16 +237,16 @@
                if (order.getSettle() > 2) {
                    continue;
                }
                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetls)) {
                List<OrderDetlPakout> orderDetlPakouts = orderService.selectWorkingDetls(order.getId());
                if (!Cools.isEmpty(orderDetlPakouts)) {
                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
                    for (OrderDetl orderDetl : orderDetls) {
                    for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setMatnr(orderDetlPakout.getMatnr());
                        combMat.setBatch(orderDetlPakout.getBatch());
                        combMat.setAnfme(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty());
                        combMat.setMaktx(orderDetlPakout.getMaktx());
                        combMat.setSpecs(orderDetlPakout.getSpecs());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
@@ -280,25 +281,8 @@
    }


    @RequestMapping("/pack/get/auth")
    @ManagerAuth
    public R packGet(@RequestParam String barcode) {
        Pack pack = packService.selectByBarcode(barcode);
        if (pack == null) {
            return R.ok();
        }
        if (pack.getSettle() == 1L) {
            return R.ok().add(pack);
        }
        return R.ok("组托成功");
    }

    @RequestMapping("/pack/comb/auth")
    @ManagerAuth(memo = "下线组托")
    public R packComb(@RequestBody CombParam combParam) {
        mobileService.packComb(combParam, getUserId());
        return R.ok("组托成功");
    }



    // 出库 ---------------------------------------------------------------------------------------------------
@@ -358,16 +342,16 @@
            return R.ok();
        }
//        List<Order> orders = orderService.selectorderNoL(batch);
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetl)) {
        OrderDetlPakout orderDetlPakout = orderDetlService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
        if (Cools.isEmpty(orderDetlPakout)) {
            return R.error("未查到数据");
        }
        if (!orderDetl.getQty$().equals("已完成")) {
        if (!orderDetlPakout.getQty$().equals("已完成")) {
            return R.error("任务未完成");
        }
        //复核数
        orderDetl.setSource(1);
        orderDetlService.updateById(orderDetl);
        orderDetlPakout.setSource(1);
        orderDetlService.updateById(orderDetlPakout);
        return R.ok();
    }

@@ -519,7 +503,6 @@
    }



    @PostMapping("/order/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -529,7 +512,6 @@
        mobileService.pakoutByOrder(param, getUserId());
        return R.ok("出库成功");
    }



    @RequestMapping("/ddd/ddd")