#

Administrator

1 天以前 47e872ed061be9411493e6f097f666c20663fd13

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

@@ -114,62 +114,14 @@
        return R.ok().add(openService.pakinOrderComplete(param));
    }

    /**
     * 添加出库单
     */
    @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);
        }
        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();
    }

    /**
     * 执行订单出库
     */
    @PostMapping("/order/pakout/execute/default/v1")
    @AppAuth(memo = "执行订单出库")
    public synchronized R pakoutOrderExecute(@RequestHeader(required = false) String appkey,
                                             @RequestBody OpenOrderPakoutExecuteParam param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderId())) {
            return R.error("出库单号[orderId]不能为空");
        }
        if (Cools.isEmpty(param.getExecute())) {
            return R.error("执行动作[execute]不能为空");
        }
        return openService.pakoutOrderExecute(param);
    }

    /**
     * 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())) {
    public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
            return R.error("orderNo is empty");
        }
        return openService.pakoutOrderPause(param);
@@ -365,7 +317,7 @@
     * 托盘就绪状态查询
     */
    @PostMapping("/arm/task/loc_status")
    @AppAuth(memo = "托盘就绪状态查询")
//    @AppAuth(memo = "托盘就绪状态查询")
    public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
                                                 @RequestBody ArmOKParam param,
                                                 HttpServletRequest request) {
@@ -392,7 +344,7 @@
     * 异常上报
     */
    @PostMapping("/armAbnormalOperation")
    @AppAuth(memo = "异常上报")
//    @AppAuth(memo = "异常上报")
    public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
                                                 @RequestBody TaskArmErrorParam param,
                                                 HttpServletRequest request) {
@@ -412,7 +364,7 @@
     * 订单完成上报
     */
    @PostMapping("/arm/task/order_result")
    @AppAuth(memo = "订单完成上报")
//    @AppAuth(memo = "订单完成上报")
    public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
                                                 @RequestBody OrderArmEndParam param,
                                                 HttpServletRequest request) {
@@ -481,15 +433,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());
//        }
@@ -499,6 +445,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) {
@@ -519,5 +470,28 @@
        }
        return R.ok();
    }

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/default/v1")
//    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestBody OpenOrderPakoutParam param) {
//        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        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();
    }
}