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 900c78569..f6b6a4e60 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 @@ -431,7 +431,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme JSONObject param = new JSONObject(); param.put("device_code", device_code); logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,参数:" + param); - this.requiresShipDeviceUpdate = true; HttpResponse response = acsToWmsService.shipDeviceUpdate(param); if (response == null || response.getStatus() == 200) { logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,接口返回:" + response.body()); @@ -441,6 +440,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme future.completeExceptionally(e); } }); + this.requiresShipDeviceUpdate = true; } public void sendDeviceStatus(JSONObject param) { @@ -450,11 +450,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme try { acsToWmsService.sendDeviceStatus(param); future.complete("Async operation completed"); - this.requiresShipDeviceUpdate = true; } catch (Exception e) { future.completeExceptionally(e); } }); + this.requiresShipDeviceUpdate = true; } private void taskDeviceUpdate(int task) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java index cf2aa6a8f..8ff24d622 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/PackagePointIvtServiceImpl.java @@ -47,12 +47,12 @@ public class PackagePointIvtServiceImpl implements PackagePointIvtService { map.put("point_code", "%" + whereJson.get("point_code") + "%"); } map.put("product_area", whereJson.get("product_area")); - map.put("point_status", whereJson.get("point_status")); + map.put("point_type", whereJson.get("point_type")); map.put("is_used", whereJson.get("is_used")); if (ObjectUtil.isNotEmpty(in_area_id)) { map.put("in_area_id", in_area_id); } - JSONObject json = WQL.getWO("ST_IVT_PACKAGEPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); + JSONObject json = WQL.getWO("ST_IVT_PACKAGEPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,ivt_id"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_PACKAGEPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_PACKAGEPOINTIVT.wql index 6b1d73f0d..325a1744f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_PACKAGEPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_PACKAGEPOINTIVT.wql @@ -15,7 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.point_code TYPEAS s_string - 输入.point_status TYPEAS s_string + 输入.point_type TYPEAS s_string 输入.product_area TYPEAS s_string 输入.is_used TYPEAS s_string 输入.in_area_id TYPEAS f_string @@ -53,8 +53,8 @@ OPTION 输入.point_code <> "" point_code LIKE 输入.point_code ENDOPTION - OPTION 输入.point_status <> "" - point_status = 输入.point_status + OPTION 输入.point_type <> "" + point_type = 输入.point_type ENDOPTION OPTION 输入.product_area <> "" product_area = 输入.product_area diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java index 40459bac5..889e9b8a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java @@ -118,7 +118,7 @@ public class PaperTubeTask extends AbstractAcsTask { String have_qzz = cbz_jo.getString("have_qzz"); //判断当前RGV上是否存在未拔轴的成品卷 JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0); - if ( "0".equals(have_qzz) || "0".equals(rgv_jo.getString("have_qzz"))){ + if ( "0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz"))){ PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class); //todo:创建桁架任务搬运一个符合的气涨轴 JSONObject jo = new JSONObject(); diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue index 303b90336..855322a2f 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue @@ -40,7 +40,7 @@ @@ -211,7 +211,7 @@ const defaultForm = { export default { name: 'DeliveryPointIvt', components: { pagination, crudOperation, rrOperation, udOperation }, - dicts: ['delivery_point_status', 'product_area', 'is_used', 'point_location'], + dicts: ['PACKAGE_POINT_TYPE', 'product_area', 'is_used', 'point_location'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 581bffe48..8dd664c79 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -141,6 +141,7 @@ +