1

ZY

2024-10-28 d75cbb1bbf53219034aeff3a27b0d1dd083c51ff

1

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

@@ -117,7 +117,7 @@
        }
        Integer pltType = null;
        //仓库编码
        if (Cools.isEmpty(order.getPltType())) {
        if (Cools.isEmpty(order.getPltType()) && !Cools.isEmpty(locNo)) {
            AgvLocMast locNo1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
            pltType = locNo1.getPltType();
        }
@@ -230,6 +230,7 @@
        int code = doHttpRequest(reportErpParam, "单据审核", url, orderReportPath, null, "127.0.0.1");
        //int code = doHttpRequest(param, "单据审核", "localhost:8080", "/test/report", null, "127.0.0.1");
        if (code == 0) {
            log.info("单据审核,{}", order);
            order.setSettle(6L);
            this.updateById(order);
        }

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

@@ -503,7 +503,8 @@
            }
            return SUCCESS;
        } catch (Exception e) {
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }

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

@@ -74,9 +74,13 @@
        ReportErpParam param = new ReportErpParam();
        mappingParam(order, param);
        mappingParamChildren(orderDetlList, param);
        if (Cools.isEmpty(order.getPltType())) {
            return SUCCESS;
        }

        int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
        if (code == 0) {
            log.info("单据审核,{}", order);
            order.setSettle(6L);
            orderService.updateById(order);
        }
@@ -103,12 +107,15 @@
                ReportErpParam param = new ReportErpParam();
                mappingParam(order, param);
                mappingParamChildren(report, param);
                if (Cools.isEmpty(order.getPltType())) {
                    return;
                }

                int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
                if (code == 0) {
                    for (OrderDetl orderDetl : orderDetlList) {
                        orderDetl.setReportQty(orderDetl.getQty());
                        log.info("{}单子上报了：{}", order.getOrderNo(),orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                        log.info("{}单据审核上报了：{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                        orderDetlService.updateById(orderDetl);
                    }
                }
@@ -118,7 +125,8 @@
    }

    public void mappingParam(Order order, ReportErpParam param) {
        param.set操作系统号(order.getDefNumber());
        //param.set操作系统号(order.getDefNumber());
        param.set操作系统号("998");
        param.set操作单据(order.getDocType$());
        param.set操作类型("add");
        param.setDdate(order.getOrderTime());
@@ -127,7 +135,7 @@
        param.setCOrderCode(order.getOrderNo());
        param.setCMaker("");
        param.setCHandler("");
        param.setCDefine14(order.getOrderNo()+"_"+DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss));
        param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
    }

    public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {