From 6a051ce15cc92aed3acf77e05eb824f0eaac261c Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 27 Dec 2022 16:33:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index ecd089c8a..0aff37c95 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -263,6 +263,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme itemMap.put(to_param, value); // itemMap.put(to_param, Integer.parseInt(value)); ReadUtil.write(itemMap, server); + logServer.deviceExecuteLog(device_code,"","","下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + value); } public void executing(Server server, Map itemMap) { From db15415e3c00be97aca35c4f3ed32e62972ebf1b Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 27 Dec 2022 17:30:56 +0800 Subject: [PATCH 2/3] =?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 --- .../java/org/nl/wms/sch/tasks/OutTask.java | 49 ++++++++++++----- .../service/impl/CheckOutBillServiceImpl.java | 53 +++++++++++++++++-- .../org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql | 12 ++--- 3 files changed, 93 insertions(+), 21 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java index c365978c8..1627a0145 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java @@ -42,23 +42,48 @@ public class OutTask extends AbstractAcsTask { /* * 下发给ACS时需要特殊处理 */ - JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' order by sort_seq ASC").getResultJSONArray(0); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { JSONObject json = arr.getJSONObject(i); - AcsTaskDto dto = AcsTaskDto.builder() - .ext_task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code2")) - .vehicle_code(json.getString("vehicle_code")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); + // 1.查询此任务是否有任务组 + if (ObjectUtil.isEmpty(json.getString("task_group_id"))) { + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json.getString("task_id")) + .task_code(json.getString("task_code")) + .task_type(json.getString("acs_task_type")) + .start_device_code(json.getString("point_code1")) + .next_device_code(json.getString("point_code2")) + .vehicle_code(json.getString("vehicle_code")) + .priority(json.getString("priority")) + .remark(json.getString("remark")) + .build(); + resultList.add(dto); + } else { + // 2.有任务组：按照执行顺序下发 大到小 + JSONArray taskArr = wo_Task.query("task_group_id = '" + json.getString("task_group_id") + "' order by sort_seq DESC").getResultJSONArray(0); + + for (int j = 0; j < taskArr.size(); j++) { + JSONObject json2 = taskArr.getJSONObject(j); + + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json2.getString("task_id")) + .task_code(json2.getString("task_code")) + .task_type(json2.getString("acs_task_type")) + .start_device_code(json2.getString("point_code1")) + .next_device_code(json2.getString("point_code2")) + .vehicle_code(json2.getString("vehicle_code")) + .priority(json2.getString("priority")) + .remark(json2.getString("remark")) + .build(); + resultList.add(dto); + } + } } return resultList; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 05255ca70..661d66c60 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -27,6 +27,7 @@ import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; +import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.OutTask; import org.nl.wms.st.inbill.service.CheckOutBillService; @@ -2465,16 +2466,62 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { @Override @Transactional(rollbackFor = Exception.class) public void issueTask(JSONObject whereJson) { - //出库分配表 - WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); + + JSONObject jsonTask = wo_Task.query("task_id = '" + whereJson.getString("task_id") + "'").uniqueResult(0); + + // 调用出库任务类下发任务 + new OutTask().immediateNotifyAcs(jsonTask.getString("task_id")); +// List acsTaskDtos = new OutTask().addTask(); +// System.out.println(acsTaskDtos.toString()); + + // 更新任务状态为下发 + jsonTask.put("task_status",TaskStatusEnum.ISSUE.getCode()); + jsonTask.put("update_optid",currentUserId); + jsonTask.put("update_optname",nickName); + jsonTask.put("update_time",now); + wo_Task.update(jsonTask); + + /* ArrayList resultList = new ArrayList<>(); + // 1.查询此任务是否有任务组 - // 2.有任务组：按照执行顺序下发 + JSONObject jsonTask = wo_Task.query("task_id = '" + whereJson.getString("task_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonTask.getString("task_group_id"))) { + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(jsonTask.getString("task_id")) + .task_code(jsonTask.getString("task_code")) + .task_type(jsonTask.getString("acs_task_type")) + .start_device_code(jsonTask.getString("point_code1")) + .next_device_code(jsonTask.getString("point_code2")) + .vehicle_code(jsonTask.getString("vehicle_code")) + .priority(jsonTask.getString("priority")) + .remark(jsonTask.getString("remark")) + .build(); + resultList.add(dto); + } else { + // 2.有任务组：按照执行顺序下发 大到小 + JSONArray taskArr = wo_Task.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' order by sort_seq DESC").getResultJSONArray(0); + for (int i = 0; i < taskArr.size(); i++) { + JSONObject json = taskArr.getJSONObject(i); + + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json.getString("task_id")) + .task_code(json.getString("task_code")) + .task_type(json.getString("acs_task_type")) + .start_device_code(json.getString("point_code1")) + .next_device_code(json.getString("point_code2")) + .vehicle_code(json.getString("vehicle_code")) + .priority(json.getString("priority")) + .remark(json.getString("remark")) + .build(); + resultList.add(dto); + } + }*/ } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql index 8a13a055d..1d63ceae9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql @@ -255,12 +255,12 @@ IF 输入.flag = "6" QUERY SELECT - ivt.struct_id, - ivt.material_id, - sum(ivt.canuse_qty) AS canuse_qty, - max(ivt.pcsn) AS pcsn, - ivt.qty_unit_id, - unit.unit_name + max( ivt.struct_id ) AS struct_id, + max( ivt.material_id ) AS material_id, + sum( ivt.canuse_qty ) AS canuse_qty, + max( ivt.pcsn ) AS pcsn, + max( ivt.qty_unit_id ) AS qty_unit_id, + max( unit.unit_name ) AS unit_name FROM ST_IVT_StructIvt ivt LEFT JOIN md_pb_measureunit unit ON ivt.qty_unit_id = unit.measure_unit_id From c96b705d7de1ef7511dbb19d3d815d53b836472d Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 27 Dec 2022 18:13:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java | 7 ++++--- .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index c7cc53f5a..4e87063ac 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -390,7 +391,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("ApplyLabelingAndBindingRequest----请求参数{}", param); try { String result = HttpRequest.post(url) - .body(String.valueOf(param)) + .body(JSON.toJSONString(param)) .execute().body(); JSONObject jsonObject = JSONObject.parseObject(result); log.info("ApplyLabelingAndBindingResponse----返回参数{}", result); @@ -416,7 +417,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("LiKuApplyTaskRequest----请求参数{}", param); try { String result = HttpRequest.post(url) - .body(String.valueOf(param)) + .body(JSON.toJSONString(param)) .execute().body(); JSONObject jsonObject = JSONObject.parseObject(result); log.info("LiKuApplyTakResponse----返回参数{}", result); @@ -444,7 +445,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("UpdateLKTaskResponse----请求参数{}", param); try { String result = HttpRequest.post(url) - .body(String.valueOf(param)) + .body(JSON.toJSONString(param)) .execute().body(); JSONObject jsonObject = JSONObject.parseObject(result); log.info("UpdateLKTaskResponse----返回参数{}", result); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 49b8a13e1..bee6cf56d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -617,7 +617,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); JSONObject feed_jo = new JSONObject(); - feed_jo.put("ext_task_id", entity.getExt_task_id()); + feed_jo.put("task_id", entity.getExt_task_id()); feed_jo.put("task_code", dto.getTask_code()); feed_jo.put("task_status", dto.getTask_status()); JSONArray ja = new JSONArray();