AGV调试整改

zyx

2023-10-04 45c2bf51fae3030c8e22fa2f2016b64a28928547

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

@@ -51,6 +51,10 @@
    private ErpService erpService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private ManPakOutService manPakOutService;

    @Value("${u8.url}")
    private String url;
@@ -96,9 +100,15 @@
            }
        }
        // 如果 作业数量等于单据总数量 && 工作明细档中无该单据的数据 && AGV工作明细档中无该单据的数据
        if (complete
                && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1
                && agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no",orderNo)) < 1) {
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) < 1;
        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().eq("order_no",orderNo)) < 1;
        boolean waitPakinExist = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",orderNo)) < 1;

        ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);

        boolean manPakoutExist = Cools.isEmpty(manPakOut) || manPakOut.getPayment() == 1;
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {

            // 出库订单重新整理明细
//            DocType docType = docTypeService.selectById(order.getDocType());
//            if (null != docType && docType.getPakout() == 1) {
@@ -123,7 +133,6 @@
//                    }
//                }
//            }

            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
@@ -259,9 +268,13 @@
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);

            int code = (int) jsonObject.get("code");
            if(code != 200){
                throw new CoolException(jsonObject.get("msg").toString());
            if(Cools.isEmpty(jsonObject.get("errCode"))){
                throw new CoolException(jsonObject.get("Message").toString());
            }

            int code = (int) jsonObject.get("errCode");
            if(code != 0){
                throw new CoolException(jsonObject.get("errMsg").toString());
            }
            success = true;
            return code;