1

ZY

2024-10-31 fb4cfaec4b05618ef49f483cd80b770a286bb9f8

1

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

@@ -156,24 +156,29 @@


    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "同步工单单据")
    //@AppAuth(memo = "同步工单单据")
    public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
                                      //@RequestBody(required = false) HashMap<String,Object> param,
                                      @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request) {
        log.info("同步工单单据,{}", JSON.toJSONString(param));
        auth(appkey, param, request);
        ///auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        DocType type = getType(param.get操作单据(), param.getIQuantity());
        if (!Cools.isEmpty(type)) {
            if (type.getDocName().equals("MO")) {
            if (param.get操作单据().equals("MO")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                mappingPakOutOrderParam(param, false, "银座委外材料出库单");
            } else if (type.getDocName().equals("OM")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                if (!Cools.isEmpty(param.getChildren())) {
                mappingPakOutOrderParam(param, false, "银座生产材料出库单");
                }
            } else if (param.get操作单据().equals("OM")) {
                mappingPakInOrderParam(param, true, type.getDocName());
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingPakOutOrderParam(param, false, "银座委外材料出库单");
                }

            } else {
                if (type.getPakin() == 1) {
                    mappingPakInOrderParam(param, true, type.getDocName());
@@ -268,7 +273,7 @@
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setcPOID(child.get(0).getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());
        orderSyncParam.setcMemo("");
        orderSyncParam.setcMemo(param.getCMemo());

        //生成单据明细
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -283,13 +283,17 @@

            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                throw new CoolException("调用AGV响应错误");
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
            }
            success = true;
            return code;
        }catch (Exception e){
            log.error(e.getMessage());
            throw new CoolException("调用AGV响应错误");
            //TODO 张超
            //throw new CoolException("调用AGV响应错误");
            return 1;
        }finally {
            apiLogService.save(
                    namespace,

 src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java

@@ -130,13 +130,16 @@

            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                throw new CoolException("调用AGV响应错误");
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
            }
            success = true;
            return code;
        }catch (Exception e){
            log.error(e.getMessage());
            throw new CoolException("调用AGV响应错误");
            //throw new CoolException("调用AGV响应错误");
            return 1;
        }finally {
            apiLogService.save(
                    namespace,