From 4c701a555c721fb828794361254f04d7d2ed8906 Mon Sep 17 00:00:00 2001 From: ludj Date: Thu, 6 Jul 2023 14:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/start/Init.java | 4 ++-- .../main/java/org/nl/wms/common/KilnUtil.java | 20 ++++++++++++++++--- .../wms/ext/acs/service/WmsToJnService.java | 4 ++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 12 ++--------- .../org/nl/wms/ext/acs/wql/WMSTOJN_001.wql | 1 + .../wms/sch/manage/buss/CallMaterialTask.java | 6 +++--- .../nl/wms/sch/manage/buss/ToPackIngTask.java | 2 +- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java b/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java index d48cee0..b2a677d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/start/Init.java @@ -44,7 +44,7 @@ public class Init implements ApplicationRunner { isStart = true; System.out.println("系统启动成功!"); //将窑设备的信息导入内存中 - initKiln(); +// initKiln(); } @@ -57,7 +57,7 @@ public class Init implements ApplicationRunner { for (int i = 0; i KilnQueue = new ArrayBlockingQueue<>(10); +// public static Queue KilnQueue = new ArrayBlockingQueue<>(10); //入窑扫码 public static void inKiln(String vehicle_code) { - KilnQueue.offer(vehicle_code); +// KilnQueue.offer(vehicle_code); //插入窑设备记录表 WQLObject recordTable = WQLObject.getWQLObject("pdm_bi_kilnrecord"); WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup"); @@ -35,11 +36,18 @@ public class KilnUtil { jo.put("is_success", "0"); jo.put("is_delete", "0"); recordTable.insert(jo); + + //入窑调用MES接口 + JSONObject jo2 = new JSONObject(); + jo.put("vehicle_code", vehicle_code); + // 调用wms的接口 + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackInKiln(jo2); } //出窑扫码 public static void outKiln(String vehicle_code) { - KilnQueue.offer(vehicle_code); +// KilnQueue.offer(vehicle_code); //更新窑设备记录表 WQLObject recordTable = WQLObject.getWQLObject("pdm_bi_kilnrecord"); JSONObject vehicleObj = recordTable.query("vehicle_code='"+vehicle_code+"'and out_time=''","in_time desc").uniqueResult(0); @@ -48,6 +56,12 @@ public class KilnUtil { } vehicleObj.put("out_time", DateUtil.now()); recordTable.update(vehicleObj); + + JSONObject jo = new JSONObject(); + jo.put("vehicle_code", vehicle_code); + // 调用wms的接口 + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackOutKiln(jo); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java index f6d2f08..abe7637 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToJnService.java @@ -95,7 +95,7 @@ public interface WmsToJnService { Map queryCurrentOrder(Map whereJson); /** - * 反馈入冷却缓冲区 + * 出窑炉进冷却缓冲区 * * @param * @return Map @@ -103,7 +103,7 @@ public interface WmsToJnService { Map feedBackInWait(Map whereJson); /** - * 反馈出冷却缓冲区 + * 反馈出冷却缓冲区(出窑成品货架-->分拣机械手) * * @param * @return Map diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 214ce91..7281a0e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -588,11 +588,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.debug("ACS的inKiln请求参数为:" + jsonObject); String vehicle_code = String.valueOf(jsonObject.get("vehicle_code")); KilnUtil.inKiln(vehicle_code); - JSONObject jo = new JSONObject(); - jo.put("vehicle_code", vehicle_code); - // 调用wms的接口 - WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - wmsToJnService.feedBackInKiln(jo); + JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); result.put("message", "任务状态反馈成功!"); @@ -626,11 +622,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 更新窑的信息 KilnUtil.outKiln(vehicle_code); - JSONObject jo = new JSONObject(); - jo.put("vehicle_code", vehicle_code); - // 调用wms的接口 - WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - wmsToJnService.feedBackOutKiln(jo); + JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql index a10e923..7465522 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql @@ -104,6 +104,7 @@ kiln.vehicle_code = 输入.vehicle_code ENDOPTION ENDSELECT + ORDER BY in_time desc ENDQUERY ENDIF IF 输入.flag = "4" diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index 1f0f4ec..833696d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -154,14 +154,14 @@ public class CallMaterialTask extends AbstractAcsTask { // 2是出窑缓存货架，调用反馈出冷却缓冲区 // 3是木托盘缓存货架，调用反馈半木托出临时库区 - String point_type = startPointObj.getString("point_type"); + String area_type = startPointObj.getString("area_type"); JSONObject jo = new JSONObject(); jo.put("task_id", task_id); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); - if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) { + if (StrUtil.equals(area_type, AreaEnum.CYHCHJ.getCode())) { wmsToJnServiceImpl.feedBackOutWait(jo); } - if (StrUtil.equals(point_type, AreaEnum.BTHCQ.getCode())) { + if (StrUtil.equals(area_type, AreaEnum.BTHCQ.getCode())) { wmsToJnServiceImpl.feedBackOutPartStock(jo); } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java index cee0b25..4a98442 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java @@ -62,7 +62,7 @@ public class ToPackIngTask extends AbstractAcsTask { JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); startPointObj.put("lock_type", "00"); startPointObj.put("point_status", "00"); - startPointObj.put("vehicle_code", ""); +// startPointObj.put("vehicle_code", ""); startPointObj.put("update_time", DateUtil.now()); pointTab.update(startPointObj);