opt:基础功能优化

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);

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 {

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'

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) {

lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue

@@ -85,6 +85,44 @@
                 <el-input v-model="form.ext_id" style="width: 200px;" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item :label="$t('wms.basedata.master.material.materialCategory')" prop="material_type_id">
+                <el-select
+                  v-model="form.material_type_id"
+                  size="mini"
+                  :placeholder="$t('wms.basedata.master.material.pleaseSelect')"
+                  class="filter-item"
+                >
+                  <el-option
+                    v-for="item in dict.material_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="$t('wms.basedata.master.material.measureUnit')" prop="base_unit_id">
+                <el-select
+                  v-model="form.base_unit_id"
+                  size="mini"
+                  :placeholder="$t('wms.basedata.master.material.measureUnit')"
+                  class="filter-item"
+                >
+                  <el-option
+                    v-for="item in measure_unit"
+                    :key="item.measure_unit_id"
+                    :label="item.unit_name"
+                    :value="item.measure_unit_id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+          <el-row>
             <el-col :span="8">
               <el-form-item :label="$t('wms.basedata.master.material.isEnabled')" prop="is_used">
                 <el-radio v-model="form.is_used" label="0">{{ $t('wms.basedata.master.material.no') }}</el-radio>
@@ -114,6 +152,8 @@
         <el-table-column prop="material_name" :label="$t('wms.basedata.master.material.materialName')" width="180" show-overflow-tooltip />
         <el-table-column prop="material_spec" :label="$t('wms.basedata.master.material.materialSpecification')" width="140" />
         <el-table-column prop="material_model" :label="$t('wms.basedata.master.material.materialModel')" />
+        <el-table-column prop="class_code" :label="$t('wms.basedata.master.material.materialClassCode')" width="120" />
+        <el-table-column prop="class_name" :label="$t('wms.basedata.master.material.materialClass')" width="140" />
         <el-table-column prop="unit_name" :label="$t('wms.basedata.master.material.measureUnit')" />
         <el-table-column prop="standing_time" :label="$t('wms.basedata.master.material.standingTimeMinutes')" width="130px" />
         <el-table-column :label="$t('wms.basedata.master.material.enabled')" align="center" prop="is_used">
@@ -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' }
         ]
       }
     }