From b166d27960fa3b666dd73811323491bf7afd7cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Thu, 23 Apr 2026 14:13:50 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RawAssistIStorServiceImpl.java | 4 +- .../service/impl/StorPublicServiceImpl.java | 20 +++++++-- lms/nladmin-ui/src/main.js | 2 +- lms/nladmin-ui/src/views/login.vue | 6 ++- .../wms/basedata/master/material/index.vue | 44 ++++++++++++++++++- 5 files changed, 66 insertions(+), 10 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java index b8f3896..90a2fe0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java @@ -444,13 +444,13 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService { queryWrapper.eq("container_name", container_name); } if (StrUtil.isNotEmpty(bill_code)) { - queryWrapper.eq("bill_code", bill_code); + queryWrapper.eq("sale_order_name", bill_code); } if (StrUtil.isNotEmpty(sap_pcsn)) { queryWrapper.eq("sap_pcsn", sap_pcsn); } if (StrUtil.isNotEmpty(material_search)) { - queryWrapper.like("material_search", material_search); + queryWrapper.like("product_name", material_search); } if (StrUtil.isNotEmpty(begin_time)) { String beginDate = begin_time.substring(0, 10); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java index 54e9fe6..c2315e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -230,7 +230,10 @@ public class StorPublicServiceImpl implements StorPublicService { double ivt_qty = jo_in.getDoubleValue("ivt_qty"); double canuse_qty = NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"), change_qty); if (canuse_qty < 0) { - throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative1")); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative1") + + "库存数：" + jo_in.getString("canuse_qty") + + "变更数：" + change_qty + + "物料标识：" + material_id_In); } jo_in.put("canuse_qty", canuse_qty); jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); @@ -313,7 +316,10 @@ public class StorPublicServiceImpl implements StorPublicService { throw new BadRequestException(LangBehavior.language("system.inputDataException")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2") + + "可用数：" + jo_in.getString("canuse_qty") + + "变更数：" + change_qty + + "物料标识：" + material_id_In); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { @@ -339,7 +345,10 @@ public class StorPublicServiceImpl implements StorPublicService { throw new BadRequestException(LangBehavior.language("system.stockNumNotNegative")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2") + + "可用数：" + jo_in.getString("canuse_qty") + + "变更数：" + change_qty + + "物料标识：" + material_id_In); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { @@ -403,7 +412,10 @@ public class StorPublicServiceImpl implements StorPublicService { throw new BadRequestException(LangBehavior.language("system.stockNumNotNegative")); } if (jo_in.getDoubleValue("canuse_qty") < 0) { - throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2")); + throw new BadRequestException(LangBehavior.language("system.availableNumNotNegative2") + + "可用数：" + jo_in.getString("canuse_qty") + + "变更数：" + change_qty + + "物料标识：" + material_id_In); } structivtService.updateById(jo_in.toJavaObject(StIvtStructivt.class)); } else { diff --git a/lms/nladmin-ui/src/main.js b/lms/nladmin-ui/src/main.js index a274396..c23ece5 100644 --- a/lms/nladmin-ui/src/main.js +++ b/lms/nladmin-ui/src/main.js @@ -22,7 +22,7 @@ import './assets/styles/index.scss' import i18n from './i18n' import { fetchMessages } from '@/api/i18n' // 有一个API模块来获取语言文件 // 当前语言，可以从本地存储、用户设置或URL参数中获取 -const currentLocale = localStorage.getItem('lang') +const currentLocale = localStorage.getItem('lang') || 'zh' // 代码高亮 import VueHighlightJS from 'vue-highlightjs' import 'highlight.js/styles/atom-one-dark.css' diff --git a/lms/nladmin-ui/src/views/login.vue b/lms/nladmin-ui/src/views/login.vue index 0216aad..fe4b824 100644 --- a/lms/nladmin-ui/src/views/login.vue +++ b/lms/nladmin-ui/src/views/login.vue @@ -70,7 +70,6 @@ export default { data() { return { language: '简体中文', - title: i18n.t('platform.title'), title_param: 'platform', Background: Background, codeUrl: '', @@ -91,6 +90,11 @@ export default { redirect: undefined } }, + computed: { + title() { + return this.$t('platform.title') + } + }, watch: { $route: { handler: function(route) { diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue index 789bdcb..76fc354 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue @@ -85,6 +85,44 @@ + + + + + + + + + + + + + + + + + + {{ $t('wms.basedata.master.material.no') }} @@ -114,6 +152,8 @@ + + @@ -234,8 +274,8 @@ export default { is_used: [ { required: true, message: this.$t('wms.basedata.master.material.isEnabledCannotBeEmpty'), trigger: 'blur' } ], - material_type_id: [ - { required: true, message: this.$t('wms.basedata.master.material.cannotBeEmpty'), trigger: 'blur' } + base_unit_id: [ + { required: true, message: this.$t('wms.basedata.master.material.isEnabledCannotBeEmpty'), trigger: 'blur' } ] } }