diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InEmptyVehicleTask.java index 60a7e79..4daf0e3 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InEmptyVehicleTask.java @@ -3,6 +3,7 @@ package org.nl.wms.sch.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -54,26 +55,35 @@ public class InEmptyVehicleTask extends AbstractAcsTask { //更新空载具表状态 JSONObject jsonEtv = etvTab.query("task_uuid='" + taskObj.getString("task_uuid") + "'").uniqueResult(0); - jsonEtv.put("update_by", SecurityUtils.getCurrentUsername()); - jsonEtv.put("update_time", DateUtil.now()); - jsonEtv.put("bill_status", EmptyVehicleBillStatusEnum.FINISHED.getCode()); - etvTab.update(jsonEtv); + if (ObjectUtil.isNotEmpty(jsonEtv)) { + jsonEtv.put("update_by", SecurityUtils.getCurrentUsername()); + jsonEtv.put("update_time", DateUtil.now()); + jsonEtv.put("bill_status", EmptyVehicleBillStatusEnum.FINISHED.getCode()); + etvTab.update(jsonEtv); + } + //解锁货位 WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); //解锁起始点位 - JSONObject startPoint = pointTab.query("point_code='" + jsonEtv.getString("start_point_code") + "'").uniqueResult(0); - startPoint.put("lock_type", "00"); - startPoint.put("point_status", "00"); - startPoint.put("vehicle_code", ""); - pointTab.update(startPoint); - + JSONObject startPoint = pointTab.query("point_code='" + taskObj.getString("start_point_code") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(startPoint)) { + startPoint.put("lock_type", "00"); + startPoint.put("point_status", "00"); + startPoint.put("vehicle_code", ""); + pointTab.update(startPoint); + } //解锁下一点位 - JSONObject nextPoint = pointTab.query("point_code='" + jsonEtv.getString("next_point_code") + "'").uniqueResult(0); - nextPoint.put("lock_type", "00"); - nextPoint.put("point_status", "01"); - nextPoint.put("vehicle_code", jsonEtv.getString("vehicle_code")); - pointTab.update(nextPoint); + JSONObject nextPoint = pointTab.query("point_code='" + taskObj.getString("next_point_code") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(nextPoint)) { + nextPoint.put("lock_type", "00"); + nextPoint.put("point_status", "01"); + nextPoint.put("vehicle_code", taskObj.getString("vehicle_code")); + pointTab.update(nextPoint); + + } + + } @@ -175,7 +185,7 @@ public class InEmptyVehicleTask extends AbstractAcsTask { //锁住起始点位 WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); JSONObject jsonPoint = pointTab.query("point_code = '" + start_point_code + "'").uniqueResult(0); - jsonPoint.put("lock_type","01"); + jsonPoint.put("lock_type", "01"); pointTab.update(jsonPoint); return jsonTask.getString("task_uuid"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index 088ef4c..28a9b67 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -231,6 +231,16 @@ public class InTask extends AbstractAcsTask { if (!StrUtil.isEmpty(next_point_code)) { task_status = TaskStatusEnum.START_AND_POINT.getCode(); } + WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + String start_point_code = form.getString("start_point_code"); + + /* if (ObjectUtil.isNotEmpty(start_point_code)) { + JSONArray taskArry = taskTab.query("task_status <> '06' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' AND start_point_code = '" + start_point_code + "'").getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(taskArry)) { + throw new BadRequestException("该点位【" + start_point_code + "】存在未完成的任务!"); + } + }*/ + taskObj.put("task_status", task_status); taskObj.put("start_point_code", form.getString("start_point_code")); taskObj.put("next_point_code", form.getString("next_point_code")); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutEmptyVehicleTask.java index 0d65852..06db417 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutEmptyVehicleTask.java @@ -3,6 +3,7 @@ package org.nl.wms.sch.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -58,26 +59,33 @@ public class OutEmptyVehicleTask extends AbstractAcsTask { //更新空载具表状态 JSONObject jsonEtv = etvTab.query("task_uuid='" + taskObj.getString("task_uuid") + "'").uniqueResult(0); - jsonEtv.put("update_by", SecurityUtils.getCurrentUsername()); - jsonEtv.put("update_time", DateUtil.now()); - jsonEtv.put("bill_status", EmptyVehicleBillStatusEnum.FINISHED.getCode()); - etvTab.update(jsonEtv); + if (ObjectUtil.isNotEmpty(jsonEtv)) { + jsonEtv.put("update_by", SecurityUtils.getCurrentUsername()); + jsonEtv.put("update_time", DateUtil.now()); + jsonEtv.put("bill_status", EmptyVehicleBillStatusEnum.FINISHED.getCode()); + etvTab.update(jsonEtv); + } + //解锁货位 WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); //解锁起始点位 - JSONObject startPoint = pointTab.query("point_code='" + jsonEtv.getString("start_point_code") + "'").uniqueResult(0); - startPoint.put("lock_type", "00"); - startPoint.put("point_status", "00"); - startPoint.put("vehicle_code", ""); - pointTab.update(startPoint); - + JSONObject startPoint = pointTab.query("point_code='" + taskObj.getString("start_point_code") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(startPoint)) { + startPoint.put("lock_type", "00"); + startPoint.put("point_status", "00"); + startPoint.put("vehicle_code", ""); + pointTab.update(startPoint); + } //解锁下一点位 - JSONObject nextPoint = pointTab.query("point_code='" + jsonEtv.getString("next_point_code") + "'").uniqueResult(0); - startPoint.put("lock_type", "00"); - startPoint.put("point_status", "01"); - startPoint.put("vehicle_code", jsonEtv.getString("vehicle_code")); - pointTab.update(nextPoint); + JSONObject nextPoint = pointTab.query("point_code='" + taskObj.getString("next_point_code") + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(nextPoint)) { + nextPoint.put("lock_type", "00"); + nextPoint.put("point_status", "01"); + nextPoint.put("vehicle_code", taskObj.getString("vehicle_code")); + pointTab.update(nextPoint); + } + } @@ -113,7 +121,7 @@ public class OutEmptyVehicleTask extends AbstractAcsTask { JSONObject jsonPoint = WQL.getWO("QSCH_OUTEMPTY01").addParamMap(param).process().uniqueResult(0); //如果没有找到空托盘删除改出库指令 if (MapUtil.isEmpty(jsonPoint)) { - return; + return; } String start_point_code = jsonPoint.getString("point_code"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java index d040f67..64ef2db 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.tasks; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.modules.system.util.CodeUtil; @@ -67,17 +68,21 @@ public class OutStByVehicleTask extends AbstractAcsTask { JSONObject taskjo = taskTab.query("task_uuid='" + taskObj.getString("task_uuid") + "'").uniqueResult(0); //解锁起始点位 JSONObject startPoint = pointTab.query("point_code='" + taskjo.getString("start_point_code") + "'").uniqueResult(0); - startPoint.put("lock_type", "00"); - startPoint.put("point_status", "00"); - startPoint.put("vehicle_code", ""); - pointTab.update(startPoint); - + if (ObjectUtil.isNotEmpty(startPoint)) { + startPoint.put("lock_type", "00"); + startPoint.put("point_status", "00"); + startPoint.put("vehicle_code", ""); + pointTab.update(startPoint); + } //解锁下一点位 JSONObject nextPoint = pointTab.query("point_code='" + taskjo.getString("next_point_code") + "'").uniqueResult(0); - startPoint.put("lock_type", "00"); - startPoint.put("point_status", "01"); - startPoint.put("vehicle_code", taskObj.getString("vehicle_code")); - pointTab.update(nextPoint); + if (ObjectUtil.isNotEmpty(nextPoint)) { + nextPoint.put("lock_type", "00"); + nextPoint.put("point_status", "01"); + nextPoint.put("vehicle_code", taskObj.getString("vehicle_code")); + pointTab.update(nextPoint); + } + } diff --git a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml index 56944ce..6a0cfed 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -12,20 +12,20 @@ dataSource2: password: root extSystem: - is-connect: true + is-connect: false #配置数据源 spring: datasource: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:jm_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true - # url: jdbc:log4jdbc:mysql://${DB_HOST:47.97.157.227}:${DB_PORT:3306}/${DB_NAME:jm_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:jm_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:jm_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true #url: jdbc:log4jdbc:mysql://${DB_HOST:47.97.157.227}:${DB_PORT:3306}/${DB_NAME:jm_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} #password: ${DB_PWD:Root.123456} - password: ${DB_PWD:root} + password: ${DB_PWD:P@ssw0rd} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/wms/hd/nladmin-system/src/main/resources/config/application.yml b/wms/hd/nladmin-system/src/main/resources/config/application.yml index f625d67..16e66f0 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms/hd/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/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml index 322d4c6..5e92f52 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -23,7 +23,7 @@ https://juejin.cn/post/6844903775631572999 ${log.pattern} - ${log.charset} + @@ -44,6 +44,7 @@ https://juejin.cn/post/6844903775631572999 %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} @@ -58,13 +59,9 @@ https://juejin.cn/post/6844903775631572999 - - + - - - diff --git a/wms/qd/src/assets/images/background.jpg b/wms/qd/src/assets/images/background.jpg index 69e6348..585e703 100644 Binary files a/wms/qd/src/assets/images/background.jpg and b/wms/qd/src/assets/images/background.jpg differ diff --git a/wms/qd/src/layout/components/Navbar.vue b/wms/qd/src/layout/components/Navbar.vue index f2345af..198b8e6 100644 --- a/wms/qd/src/layout/components/Navbar.vue +++ b/wms/qd/src/layout/components/Navbar.vue @@ -8,9 +8,9 @@