erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新...

zwl

20 小时以前 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49

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

@@ -116,20 +116,7 @@



    /**
     * pause out order
     */
    @PostMapping("/order/pakout/pause/default/v1")
    @AppAuth(memo = "pause out order")
    public synchronized R pakoutOrderPause(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakoutPauseParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo())) {
            return R.error("orderNo is empty");
        }
        return openService.pakoutOrderPause(param);
    }


    /**
     * 出库单回写
@@ -437,15 +424,9 @@
    @PostMapping("/comb/auth")
    public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
        for (MesToCombParam mesToCombParam : param) {
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }

            if (mesToCombParam.getPalletId().length() != 8) {
                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
            }
//            if (mesToCombParam.getPalletId().length() != 8) {
//                return R.error(mesToCombParam.getPalletId()+"-该托盘码不为8位");
//            }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }
@@ -455,6 +436,11 @@
//        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(mesToCombParam.getPalletId()+"-工作档/库存条码数据已存在");
            }
            // 判断是否有相同条码的数据
            if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                    eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
            }
        }
        for (MesToCombParam mesToCombParam : param) {
@@ -477,28 +463,14 @@
    }

    /**
     * 添加出库单
     * pause out order
     */
    @PostMapping("/order/pakout/default/v1")
//    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
//        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
    @PostMapping("/order/pakout/pause/default/v1")
    public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
            return R.error("orderNo is empty");
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
        return openService.pakoutOrderPause(param);
    }
}