From ddf03aaa0be9073cb85af46e1ebcfde1e8d9d396 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Fri, 11 Nov 2022 15:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E7=A0=81=E6=96=B0=E5=A2=9E=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialLabelServiceImpl.java | 7 +-- .../src/main/java/org/nl/wms/sch/AcsUtil.java | 9 ++- .../nl/wms/sch/manage/AbstractAcsTask.java | 2 +- wms/qd/src/layout/components/Sidebar/Logo.vue | 2 +- wms/qd/src/settings.js | 2 +- wms/qd/src/views/login.vue | 2 +- .../src/views/wms/md/materiallabel/index.vue | 55 +++++++++++++------ 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java index 2e0ecfb..4a3fc34 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java @@ -181,12 +181,6 @@ class MaterialLabelServiceImpl implements MaterialLabelService { jsonObject.put("is_active", is_active); WQLObject.getWQLObject("md_base_materialLabelMst").update(jsonObject); } - - public static void main(String[] args) { - String nowDate = DateUtil.format(new Date(), "yyMMddHHmm"); - System.out.println(nowDate); - } - @Override @Transactional(rollbackFor = Exception.class) public JSONObject print(JSONObject jsonMst) { @@ -205,6 +199,7 @@ class MaterialLabelServiceImpl implements MaterialLabelService { jsonDtl.put("labeldtl_uuid", IdUtil.simpleUUID()); jsonDtl.put("label_code", label_code); jsonDtl.put("order_seq", order_seq); + jsonDtl.put("weight", jsonMst.optString("weight")); jsonDtl.put("remark", ""); jsonDtl.put("print_by", SecurityUtils.getCurrentUsername()); jsonDtl.put("print_time", now); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 5075fc3..82d0f85 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -8,6 +8,8 @@ import net.sf.json.JSONObject; import org.nl.exception.BadRequestException; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.utils.SpringContextHolder; +import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; import org.springframework.http.HttpStatus; /** @@ -24,7 +26,12 @@ public class AcsUtil { result.put("data", new JSONObject()); return result; } - + // 加优先级 list + for (int i = 0; i < list.size(); i++) { + JSONObject object = list.getJSONObject(i); + String value = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode(object.getString("task_type")).getValue(); + object.put("priority", value); + } //ACS地址：127.0.0.1:8010 String acsUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("ACS_URL").getValue(); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 5cf3b45..faed707 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -54,7 +54,7 @@ public abstract class AbstractAcsTask { AcsTaskDto taskDto = new AcsTaskDto(); taskDto.setTask_uuid(json.optString("task_uuid")); taskDto.setTask_code(json.optString("task_code")); - taskDto.setTask_type(""); + taskDto.setTask_type(task_type); taskDto.setPriority(priority); taskDto.setStart_device_code(json.optString("start_point_code")); taskDto.setNext_device_code(json.optString("next_point_code")); diff --git a/wms/qd/src/layout/components/Sidebar/Logo.vue b/wms/qd/src/layout/components/Sidebar/Logo.vue index 6846e1f..58b6e5a 100644 --- a/wms/qd/src/layout/components/Sidebar/Logo.vue +++ b/wms/qd/src/layout/components/Sidebar/Logo.vue @@ -25,7 +25,7 @@ export default { }, data() { return { - title: 'NLADMIN-后台管理', + title: '诺力WMS系统', logo: Logo } } diff --git a/wms/qd/src/settings.js b/wms/qd/src/settings.js index 03acf30..8cbef6f 100644 --- a/wms/qd/src/settings.js +++ b/wms/qd/src/settings.js @@ -26,7 +26,7 @@ module.exports = { /** * @description token key */ - TokenKey: 'EL-ADMIN-TOEKN', + TokenKey: 'NL-CHENHOU-TOEKN', /** * @description 请求超时时间，毫秒（默认2分钟） */ diff --git a/wms/qd/src/views/login.vue b/wms/qd/src/views/login.vue index edac6a3..9586601 100644 --- a/wms/qd/src/views/login.vue +++ b/wms/qd/src/views/login.vue @@ -2,7 +2,7 @@

- NL-ADMIN 后台管理系统 + 诺力WMS系统

diff --git a/wms/qd/src/views/wms/md/materiallabel/index.vue b/wms/qd/src/views/wms/md/materiallabel/index.vue index 947b671..b4d4aee 100644 --- a/wms/qd/src/views/wms/md/materiallabel/index.vue +++ b/wms/qd/src/views/wms/md/materiallabel/index.vue @@ -102,6 +102,9 @@ :max="100" /> + + + @@ -194,7 +197,9 @@ const defaultForm = { create_by: null, create_time: null, update_by: null, - update_time: null + update_time: null, + color: null, + weight: null } export default { name: 'MaterialLabel', @@ -270,21 +275,39 @@ export default { }) }, print() { - const _selectData = this.$refs.table.selection - if (!_selectData || _selectData.length !== 1) { - this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO) - return - } - const data = _selectData[0] - debugger - materialLabel.print(data).then(res => { - const code = res.label_code - debugger - this.print2(code) - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - this.crud.toQuery() - }).cache(err => { - console.log(err.response.data.message) + this.$prompt('', '请输入重量', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputPattern: /^\d{4}$/, + inputErrorMessage: '重量由四个数字组成', + closeOnClickModal: false + }).then(({ value }) => { + console.log(value) + if (value === null) { + this.crud.notify('请输入重量', CRUD.NOTIFICATION_TYPE.ERROR) + return + } + const _selectData = this.$refs.table.selection + if (!_selectData || _selectData.length !== 1) { + this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO) + return + } + const data = _selectData[0] + data.weight = value + materialLabel.print(data).then(res => { + const code = res.label_code + debugger + this.print2(code) + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }).cache(err => { + console.log(err.response.data.message) + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '取消输入' + }) }) }, print2(code) {