diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java index 0b14755..5b17ba9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java @@ -82,4 +82,11 @@ public class DeviceController { return new ResponseEntity<>(deviceService.getAllRegions(),HttpStatus.OK); } + @PostMapping("/getYjDeviceList") + @ApiOperation("查询压机生产设备") + //@SaCheckPermission("device:list") + public ResponseEntity getYjDeviceList(){ + return new ResponseEntity<>(deviceService.getYjDeviceList(),HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java index 8492b31..e73110a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java @@ -72,4 +72,10 @@ public interface DeviceService { * @return */ JSONArray getAllRegions(); + + /** + * 压机设备下拉框 + * @return + */ + JSONArray getYjDeviceList(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java index 93e7ab5..6b025cc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/WorkorderDto.java @@ -122,4 +122,5 @@ public class WorkorderDto implements Serializable { private String gg; private String kh; + private String associated_device; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index c3c4cdd..307c2e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -146,4 +146,11 @@ public class DeviceServiceImpl implements DeviceService { return resultJSONArray; } + @Override + public JSONArray getYjDeviceList() { + WQLObject wo = WQLObject.getWQLObject("pdm_bi_device"); + JSONArray resultJSONArray = wo.query("region_code = 'YZ' AND device_model = '4'").getResultJSONArray(0); + return resultJSONArray; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java index b91ae8a..bbff6f1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java @@ -104,19 +104,28 @@ public class HLSendMaterialTask extends AbstractAcsTask { .process() .uniqueResult(0); } else if ("2".equals(startPointType)) { + // 通过工单的关联压机送到对应位置，如果不满足就走以下流程 nextPoint = WQL.getWO("SEND_MATERIAL_TASK") - .addParam("flag", "4") - .addParam("material_id", task.getString("material_id")) + .addParam("flag", "8") + .addParam("device_code", startPoint.getString("device_code")) .process() .uniqueResult(0); - if (ObjectUtil.isEmpty(nextPoint)) { + if (ObjectUtil.isEmpty(nextPoint) || ObjectUtil.isEmpty(nextPoint.get("point_code"))) { + // 先去普通压机困料货位 nextPoint = WQL.getWO("SEND_MATERIAL_TASK") - .addParam("flag", "5") + .addParam("flag", "4") + .addParam("material_id", task.getString("material_id")) .process() .uniqueResult(0); + if (ObjectUtil.isEmpty(nextPoint)) { + // 公共货位 + nextPoint = WQL.getWO("SEND_MATERIAL_TASK") + .addParam("flag", "5") + .process() + .uniqueResult(0); + } } } - if (ObjectUtil.isNotEmpty(nextPoint)) { task.put("task_status", TaskStatus.START_AND_END.value()); task.put("point_code2", nextPoint.getString("point_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql index f5f0a16..e8f9d5a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/wql/SEND_MATERIAL_TASK.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.material_id TYPEAS f_string 输入.vd_id TYPEAS f_string + 输入.device_code TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -159,3 +160,16 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "8" + QUERY + SELECT + p.* + FROM + `pdm_bd_workorder` wo + LEFT JOIN sch_base_point p ON p.device_code = wo.associated_device AND p.region_code = 'KLHJ' + AND p.point_type = '3' AND p.point_status = '1' AND p.lock_type = '1' AND p.is_used = '1' + WHERE wo.order_status = '3' AND wo.device_code = 输入.device_code + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 2027b26..793ecde 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index b56a5f4..d8b8de5 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:yksh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:123456} + password: ${DB_PWD:12356} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index 942ceff..6f01423 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: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java b/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java index 80c7688..7ef4093 100644 --- a/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java +++ b/lms/nladmin-system/src/test/java/org/nl/test/TempTest.java @@ -36,4 +36,15 @@ public class TempTest { .getResultJSONArray(0); info.forEach(System.out::println); } + + @Test + public void test02() { + JSONArray cupData = WQLObject.getWQLObject("st_ivt_vehicle_detail").query("is_delete = '0' AND vehicle_type = '1'").getResultJSONArray(0); + System.out.println("data" + cupData); + // 处理 + System.out.println("ssss" + String.format("%.2f", cupData.stream().filter(o -> "1".equals(((JSONObject) o).getString("stand_status"))).mapToDouble(o -> ((JSONObject) o).getDoubleValue("weight")).sum() / 1000)); + System.out.println("opop" + String.format("%.2f", cupData.stream().filter(o -> "23".contains(((JSONObject) o).getString("stand_status"))).mapToDouble(o -> ((JSONObject) o).getDoubleValue("weight")).sum() / 1000)); + List standStatus = cupData.stream().filter(o -> "23".contains(((JSONObject) o).getString("stand_status"))).collect(Collectors.toList()); + System.out.println("sdf"); + } } diff --git a/lms/nladmin-ui/src/api/wms/pdm/device.js b/lms/nladmin-ui/src/api/wms/pdm/device.js index 25adbd4..7d8b134 100644 --- a/lms/nladmin-ui/src/api/wms/pdm/device.js +++ b/lms/nladmin-ui/src/api/wms/pdm/device.js @@ -69,6 +69,12 @@ export function copyAdd(data) { data }) } +export function getYjDeviceList() { + return request({ + url: 'api/device/getYjDeviceList', + method: 'post' + }) +} export function changeActive(data) { return request({ @@ -78,4 +84,4 @@ export function changeActive(data) { }) } -export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive, getAllRegions } +export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive, getAllRegions, getYjDeviceList } diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue index de62557..d78bd16 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue @@ -208,6 +208,25 @@ + + + + + + + + +
取消 @@ -282,6 +301,7 @@ import pagination from '@crud/Pagination' import ViewDialog from '@/views/wms/pdm/workerorder/ViewDialog' import DeviceDialog from '@/views/wms/pub/DeviceDialog' import MaterDtl from '@/views/wms/pub/MaterDialog.vue' +import crudDevice from '@/api/wms/pdm/device' const defaultForm = { workorder_id: null, @@ -331,6 +351,7 @@ const defaultForm = { region_code: null, plan_date: null, plan_weight: null, + associated_device: null, dz: null, gg: null, kh: null @@ -365,6 +386,7 @@ export default { deviceShow: false, bomShow: false, workprocedureList: [], + yjDeviceList: [], order_status: ['-1'], permission: {}, orderData: {}, @@ -395,8 +417,14 @@ export default { } }, created() { + this.getYjDeviceList() }, methods: { + getYjDeviceList() { + crudDevice.getYjDeviceList().then(res => { + this.yjDeviceList = res + }) + }, // 工单状态多选搜索 handTaskStatus(value) { this.$forceUpdate()