批次前端显示

zhangchao

2024-11-11 8e2a5905563af05284495e23bc10ba8d4b741ba9

批次前端显示

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -72,10 +72,10 @@
                        continue;
                    }
                }
//                ReturnT<String> result = orderSyncHandler.start(order);
//                if (!result.isSuccess()) {
                ReturnT<String> result = orderSyncHandler.start(order);
                if (!result.isSuccess()) {
//                    log.error("单据[orderNo={}]上报erp失败", order.getOrderNo());
//                }
                }
            }
        }
    }

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

@@ -59,6 +59,8 @@

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;
    @Value("${mes.report}")
    private Boolean flag;
    @Value("${mes.url}")
    private String url;
    @Value("${mes.getTokenUrl}")
@@ -688,6 +690,9 @@
    }

    private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
        if (!flag){
            return;
        }
        if (Cools.isEmpty(agvWrkDetls)) {
            return;
        }

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

@@ -54,43 +54,31 @@

    @Transactional
    public ReturnT<String> start(Order order) {
        //List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座委外入库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座委外入库单", "银座生产材料出库单"));
        List<String> docNames = new ArrayList<>(Arrays.asList("银座采购入库单", "银座委外材料出库单", "银座生产材料出库单"));

        DocType docType = docTypeService.selectById(order.getDocType());
        if (!docNames.contains(docType.getDocName())) {
            order.setSettle(8L);
            orderService.updateById(order);
            return SUCCESS;
        }
//        if("手动出库单".equals(docType.getDocName())
//                || "手动入库单".equals(docType.getDocName())
//                || "自动补货单".equals(docType.getDocName())
//                || "人工补货单".equals(docType.getDocName())){
//            order.setSettle(8L);
//            orderService.updateById(order);
//            return SUCCESS;
//        }

        } else {
            boolean flag = true;
        List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());

        ReportErpParam param = new ReportErpParam();
        mappingParam(order, param);
        mappingParamChildren(orderDetlList, param);
        if (Cools.isEmpty(order.getPltType())) {
            return SUCCESS;
            List<OrderDetl> report = new ArrayList<>();
            for (OrderDetl orderDetl : orderDetlList) {
                if (orderDetl.getReportQty() == null || orderDetl.getQty() > orderDetl.getReportQty() || orderDetl.getQty() < orderDetl.getAnfme()) {
                    flag = false;
        }

        int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
        if (code == 0) {
            log.info("单据审核,{}", order);
            }
            if (flag) {
                log.info("单据完结,{}", order);
            order.setSettle(6L);
            orderService.updateById(order);
        }

        return SUCCESS;
    }

    }

    @Transactional
    public void timelyStart(Order order) {
@@ -181,7 +169,8 @@
    }


    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
    private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String
            ip) {
        String response = "";
        boolean success = false;


 src/main/resources/application-dev.yml

@@ -91,6 +91,7 @@
#  url: http://39.184.149.30:8877
#  orderReportPath: /DBMS/U8/CM/add
mes:
  report: false
  url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
  orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
  pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound

 src/main/resources/application-loc.yml

@@ -91,6 +91,7 @@
#  url: http://39.184.149.30:8877
#  orderReportPath: /DBMS/U8/CM/add
mes:
  report: false
  url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
  orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
  pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound

 src/main/resources/application-prod.yml

@@ -91,6 +91,7 @@
#  url: http://39.184.149.30:8877
#  orderReportPath: /DBMS/U8/CM/add
mes:
  report: true
  url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
  orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
  pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound

 src/main/resources/application.yml

@@ -1,3 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: dev