From 6db99268b6205964f07e75e3ddf11ebee82629bb Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Tue, 29 Nov 2022 13:52:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InAndOutRetrunServiceImpl.java | 17 +++++++++++------ .../src/layout/components/Sidebar/Logo.vue | 10 ++-------- lms/nladmin-ui/src/views/login.vue | 6 +----- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 3c02d93f2..0ffc77991 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -129,7 +129,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { - jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点 } JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0); @@ -258,7 +259,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { - jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点 } JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0); @@ -316,7 +318,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonSect = sectTab.query("sect_id = '" + json.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { - jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 库存地点：库区外部标识 + //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 库存地点：库区外部标识 + jsonDtl.put("LGORT", json.getString("remark")); // 库存地点：库区外部标识 } JSONObject jsonSub = subTab.query("container_name = '" + json.getString("pcsn") + "'").uniqueResult(0); @@ -442,7 +445,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { - jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + // jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点 } JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0); @@ -531,7 +535,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { - jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + //jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 + jsonDtl.put("LGORT", json.getString("remark")); // 明細储存地点 } JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0); @@ -609,7 +614,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("BWART", "311"); jsonDtl.put("MENGE", json.getDoubleValue("plan_qty")); jsonDtl.put("MEINS", json.getString("qty_unit_id")); - jsonDtl.put("LGORT", ""); // 库存地点 + jsonDtl.put("LGORT", json.getString("remark")); // 库存地点 jsonDtl.put("CHARG", json.getString("pcsn")); jsonDtl.put("UMLGO", ""); // 收货库存地点 jsonDtl.put("UMCHA", json.getString("pcsn")); diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index bc2a53d0b..c40001c76 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -34,15 +34,9 @@ export default { }, data() { return { - title: '诺力开发平台', - logo: Logo, - title_param: 'platform' + title: '甘肃海亮铜箔LMS', + logo: Logo } - }, - created() { - this.getValueByCode(this.title_param).then(res => { - this.title = res.value - }) } } diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue index caa6d0699..59876e706 100644 --- a/lms/nladmin-ui/src/views/login.vue +++ b/lms/nladmin-ui/src/views/login.vue @@ -50,8 +50,7 @@ export default { name: 'Login', data() { return { - title: '诺力开发平台', - title_param: 'platform', + title: '甘肃海亮铜箔LMS', Background: Background, codeUrl: '', cookiePass: '', @@ -80,9 +79,6 @@ export default { } }, created() { - this.getValueByCode(this.title_param).then(res => { - this.title = res.value - }) // 获取验证码 this.getCode() // 获取用户名密码等Cookie