From 4e2c8e50e0013393cc441a80bd7c27d9e49e1f17 Mon Sep 17 00:00:00 2001 From: pangshenghao Date: Tue, 8 Aug 2023 16:24:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HfKilnManipulatorDeviceDriver.java | 28 ++++++++++++++++++- .../resources/config/application-prod.yml | 2 +- .../src/main/resources/config/application.yml | 2 +- .../impl/VehicleDetailServiceImpl.java | 6 ++-- .../wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql | 12 ++++++++ .../acs/service/impl/AcsToWmsServiceImpl.java | 16 ++++++++++- .../sch/tasks/phaseTwo/PalletizingTask.java | 4 +-- .../src/main/resources/config/application.yml | 2 +- .../src/api/wms/basedata/vehicleDetail.js | 10 ++++++- 9 files changed, 70 insertions(+), 12 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_manipulator/HfKilnManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_manipulator/HfKilnManipulatorDeviceDriver.java index b0164b2..11dee66 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_manipulator/HfKilnManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_kiln_manipulator/HfKilnManipulatorDeviceDriver.java @@ -219,7 +219,8 @@ public class HfKilnManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple } //放货完成 - if (mode == 3 && action == 4 && move == 0 && task > 0) { +// if (mode == 3 && action == 4 && move == 0 && task > 0) { + if (action == 4 && move == 0 && task > 0) { Instruction inst2 = instructionService.findByCodeFromCache(String.valueOf(task)); if (inst2 != null) { if (StrUtil.equals(inst2.getInstruction_status(), "1")) { @@ -234,6 +235,31 @@ public class HfKilnManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple } } + if(mode == 4){ + this.writing("to_command", "2"); + logServer.deviceInfo("反馈电气信号", this.getDevice_code(), "条码比对失败，开始进入盘点模式"); + + } + if(mode == 5 && locate>0 && barcode>0){ + JSONObject json = new JSONObject(); + Device device = appService.findDeviceByAddress(String.valueOf(this.locate)); + //点位 + json.put("device",device.getDevice_code()); + //条码 + json.put("barcode",this.barcode); + //2-更新托盘所在位置 + json.put("state",3); + JSONObject resp = acsToWmsService.updateKiln(json); + if (StrUtil.equals(resp.getString("status"), "200")) { + this.writing("to_command", "3"); + logServer.deviceInfo("反馈电气信号", this.getDevice_code(), "单个盘点结束!"); + }else{ + log.error("操作失败，{}",json); + this.writing("to_command", "99"); + } + + } + } catch (Exception e) { diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml index 39fbbf6..b4c8753 100644 --- a/acs/nladmin-system/src/main/resources/config/application-prod.yml +++ b/acs/nladmin-system/src/main/resources/config/application-prod.yml @@ -128,7 +128,7 @@ file: avatarMaxSize: 5 logging: file: - path: C:\log\acs + path: D:\ACS_LOG config: classpath:logback-spring.xml # Sa-Token配置 diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index e56175e..2c2cb8d 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/acs/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java index 900015f..e38c336 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleDetailServiceImpl.java @@ -39,10 +39,8 @@ public class VehicleDetailServiceImpl implements VehicleDetailService { @Override public Map queryAll(Map whereJson, Pageable page) { - JSONObject pageQuery = WQL.getWO("QMD_PB_VEHICLE_GROUP").addParamMap(MapOf.of("flag", "1" - , "vehicle_code", whereJson.get("vehicle_code") - ,"region_code",whereJson.get("region_code") - ,"is_delete",whereJson.get("is_delete"))) + whereJson.put("flag", "1"); + JSONObject pageQuery = WQL.getWO("QMD_PB_VEHICLE_GROUP").addParamMap(whereJson) .pageQuery(WqlUtil.getHttpContext(page), "create_time desc"); return pageQuery; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql index 49c0b08..06f7a3f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE_GROUP.wql @@ -18,6 +18,9 @@ 输入.vehicle_type TYPEAS s_string 输入.vehicle_status TYPEAS s_string 输入.region_code TYPEAS s_string + 输入.material_code TYPEAS s_string + 输入.product_code TYPEAS s_string + 输入.kiln_code TYPEAS s_string 输入.is_delete TYPEAS s_string [临时表] @@ -58,6 +61,15 @@ OPTION 输入.region_code <> "" vd.region_code LIKE '%' 输入.region_code '%' ENDOPTION + OPTION 输入.material_code <> "" + vd.material_code LIKE '%' 输入.material_code '%' + ENDOPTION + OPTION 输入.product_code <> "" + vd.product_code LIKE '%' 输入.product_code '%' + ENDOPTION + OPTION 输入.kiln_code <> "" + vd.kiln_code LIKE '%' 输入.kiln_code '%' + ENDOPTION OPTION 输入.is_delete <> "" vd.is_delete LIKE '%' 输入.is_delete '%' ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 661851f..95973f8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -536,6 +536,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String vehicle_code = whereJson.getString("barcode"); String kiln_code = whereJson.getString("kiln_id"); Integer number =whereJson.getInteger("number"); + String device = whereJson.getString("device"); WQLObject wo = WQLObject.getWQLObject("SCH_BASE_vehicle_group"); switch (state) { //入窑 @@ -585,7 +586,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject json = new JSONObject(); json.put("point_status", 3); json.put("update_time", DateUtil.now()); - point.update(json, "point_code = 'YWHC0"+js.getString("order_seq")+"'"); + int a="2".equals(kiln_code)?21:0; + point.update(json, "point_code = 'YWHC0"+js.getString("order_seq")+a+"'"); JSONObject vihicleJson = new JSONObject(); json.put("region_code", 2); json.put("point_code", "YWHC0"+js.getString("order_seq")); @@ -607,6 +609,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { pointJson.put("update_time", DateUtil.now()); point.update(pointJson, "point_code = 'YWHC0"+json.getString("order_seq")+"'"); + }case 3:{ + JSONObject json = wo.query("vehicle_code ='" + vehicle_code + "' AND is_delete = 0").uniqueResult(0); + // 将托盘置为已拆垛并删除，供后续重复使用 + json.put("point_code", device); + wo.update(json); + //将点位更改为有货 + WQLObject point = WQLObject.getWQLObject("sch_base_point"); + JSONObject pointJson = new JSONObject(); + pointJson.put("point_status", 1); + pointJson.put("update_time", DateUtil.now()); + point.update(pointJson, "point_code = '"+device+"'"); + } default: break; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java index 20e200a..ba8ac95 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/phaseTwo/PalletizingTask.java @@ -289,8 +289,8 @@ public class PalletizingTask extends AbstractAcsTask { .task_name("包装拆垛位请求叫料") .vehicle_code(pointObj.getString("vehicle_code")) .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1("YWHC0"+pointObj.getString("order_seq")) - .point_code2((pointObj.getInteger("order_seq")>21?"FLW01":"FLW02")) + .point_code1(pointObj.getString("point_code")) + .point_code2((pointObj.getInteger("kiln_code")==1?"FLW01":"FLW02")) .priority("1") .handle_class(THIS_CLASS) .is_auto_issue(is_auto_issue) diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 9f365b8..aa03e07 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-ui/src/api/wms/basedata/vehicleDetail.js b/lms/nladmin-ui/src/api/wms/basedata/vehicleDetail.js index a83ae8a..878c430 100644 --- a/lms/nladmin-ui/src/api/wms/basedata/vehicleDetail.js +++ b/lms/nladmin-ui/src/api/wms/basedata/vehicleDetail.js @@ -24,4 +24,12 @@ export function edit(data) { }) } -export default { add, edit, del } +export function queryPoint(data) { + return request({ + url: '/api/pda/point/queryPoint', + method: 'post', + data: {} + }) +} + +export default { add, edit, del, queryPoint }