From 3ada3c2a6f5295b343ef0180097bb120fb1a5cf6 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 29 四月 2025 08:49:03 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/entity/TaskWrk.java | 13 +++++++++++++ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++----- src/main/java/com/zy/asrs/controller/TaskWrkController.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index b145e8b..3df677d 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -264,7 +264,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo",taskWrk.getTaskNo()); headParam.put("status",taskWrk.getStatus()); - headParam.put("ioType",taskWrk.getIoType()); + headParam.put("ioType",taskWrk.getIoTypeWms()); headParam.put("barcode",taskWrk.getBarcode()); // headParam.put("reportTime",new Date()); log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk); @@ -323,7 +323,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo",taskWrk.getTaskNo()); headParam.put("status",taskWrk.getStatus()); - headParam.put("ioType",taskWrk.getIoType()); + headParam.put("ioType",taskWrk.getIoTypeWms()); headParam.put("barcode",taskWrk.getBarcode()); // headParam.put("reportTime",new Date()); diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java index 220c720..a42dea1 100644 --- a/src/main/java/com/zy/asrs/entity/TaskWrk.java +++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java @@ -363,4 +363,17 @@ } } + public Integer getIoTypeWms(){ + switch (ioType){ + case 2: + return 1; + case 3: + return 2; + case 1: + return 3; + default: + return 0; + } + } + } diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 775d5fc..6eccd41 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -517,7 +517,7 @@ } } } else { - TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()); + TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("IO_TYPE",1).eq("WRK_STS",1).eq("START_POINT",staProtocol.getSiteId().toString())); if (!Cools.isEmpty(taskWrk1)) { if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) { @@ -797,7 +797,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo", taskWrk.getTaskNo()); headParam.put("status", taskWrk.getStatus()); - headParam.put("ioType", taskWrk.getIoType()); + headParam.put("ioType", taskWrk.getIoTypeWms()); headParam.put("barcode", taskWrk.getBarcode()); String response; response = new HttpHandler.Builder() @@ -917,7 +917,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo", taskWrk.getTaskNo()); headParam.put("status", taskWrk.getStatus()); - headParam.put("ioType", taskWrk.getIoType()); + headParam.put("ioType", taskWrk.getIoTypeWms()); headParam.put("barcode", taskWrk.getBarcode()); String response; response = new HttpHandler.Builder() @@ -1021,7 +1021,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo", taskWrk.getTaskNo()); headParam.put("status", taskWrk.getStatus()); - headParam.put("ioType", taskWrk.getIoType()); + headParam.put("ioType", taskWrk.getIoTypeWms()); headParam.put("barcode", taskWrk.getBarcode()); String response; response = new HttpHandler.Builder() @@ -1135,7 +1135,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo", taskWrk.getTaskNo()); headParam.put("status", taskWrk.getStatus()); - headParam.put("ioType", taskWrk.getIoType()); + headParam.put("ioType", taskWrk.getIoTypeWms()); headParam.put("barcode", taskWrk.getBarcode()); String response; log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam); diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java index 65408e9..6ba5ef3 100644 --- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java @@ -143,7 +143,7 @@ HashMap<String, Object> headParam = new HashMap<>(); headParam.put("taskNo",taskWrk.getTaskNo()); headParam.put("status",taskWrk.getStatus()); - headParam.put("ioType",taskWrk.getIoType()); + headParam.put("ioType",taskWrk.getIoTypeWms()); headParam.put("barcode",taskWrk.getBarcode()); // headParam.put("reportTime",new Date()); String response; -- Gitblit v1.9.1