From ebb22c0ee5c8c00b89515a50daf0e49103fa4f14 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期三, 18 十二月 2024 14:35:11 +0800 Subject: [PATCH] 上报逻辑调整 --- src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 32 +++++++++++++------------------- src/main/java/com/zy/asrs/controller/OpenController.java | 4 ++++ src/main/java/com/zy/asrs/entity/Order.java | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 186ce75..e599725 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -329,6 +329,10 @@ orderSyncParam.setDdate(param.getOrderTime()); } + if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) { + return; + } + //鐢熸垚鍗曟嵁鏄庣粏 OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl(); Synchro.Copy(param, orderDetl); diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java index 6799901..a4ba061 100644 --- a/src/main/java/com/zy/asrs/entity/Order.java +++ b/src/main/java/com/zy/asrs/entity/Order.java @@ -270,7 +270,7 @@ */ @ApiModelProperty(value = "鍏ュ簱鏃ユ湡") @TableField("in_time") - private String InTime; + private String inTime; @TableField("Upstreamcode") diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java index 99a2dae..e26edd6 100644 --- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java @@ -713,30 +713,24 @@ if (Cools.isEmpty(agvWrkDetls)) { return; } + List<AgvWrkDetl> data = new ArrayList<>(); //鍖哄垎涓嶅悓浠诲姟绫诲瀷鐨勪笂鎶ユ柟寮� - - if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) { - String barcode = agvWrkMast.getBarcode(); - if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) { - reportMesPakinOrder(agvWrkMast, agvWrkDetls); + for (AgvWrkDetl agvWrkDetl : agvWrkDetls) { + if (agvWrkDetl.getMatnr().startsWith("10") || agvWrkDetl.getMatnr().startsWith("20") || agvWrkDetl.getMatnr().startsWith("30")) { + data.add(agvWrkDetl); } } - if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) { - String barcode = agvWrkMast.getBarcode(); - if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) { - reportMesPakoutOrder(agvWrkMast, agvWrkDetls); + if (!Cools.isEmpty(data)) { + if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) { + reportMesPakinOrder(agvWrkMast, data); + } + if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) { + reportMesPakoutOrder(agvWrkMast, data); + } + if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) { + generateMesParam(agvWrkMast, data); } } - if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) { - String barcode = agvWrkMast.getBarcode(); - if (agvWrkMast == null || agvWrkMast.getBarcode() == null) { - return; - } - if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) { - generateMesParam(agvWrkMast, agvWrkDetls); - } - } - } -- Gitblit v1.9.1