国际化修改

lms/nladmin-system/.idea/jarRepositories.xml

@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://121.40.234.130:8081/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />

lms/nladmin-system/src/main/java/org/nl/config/MapOf.java

@@ -0,0 +1,18 @@
+package org.nl.config;
+
+
+
+import java.io.Serializable;
+import java.util.HashMap;
+
+
+public class MapOf implements Serializable {
+
+    public static <K> HashMap of(K... key){
+        HashMap map = new HashMap<>();
+        for (int i = 0; i < (key.length & ~1); i=i+2) {
+            map.put(key[i],key[i+1]);
+        }
+        return map;
+    }
+}

lms/nladmin-system/src/main/java/org/nl/config/WebMvcConfig.java

@@ -1,36 +1,15 @@
 package org.nl.config;
 
 import org.nl.common.language.InitLocaleResolver;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.ConversionServiceFactoryBean;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.converter.Converter;
 import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.HashSet;
-import java.util.Set;
 
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
-    /**
-     * 配置全局日期转换器
-     */
-    @Bean
-    @Autowired
-    public ConversionService getConversionService(StringConverter dateConverter) {
-        ConversionServiceFactoryBean factoryBean = new ConversionServiceFactoryBean();
-
-        Set<Converter> converters = new HashSet<Converter>();
-
-        converters.add(dateConverter);
 
-        factoryBean.setConverters(converters);
-
-        return factoryBean.getObject();
-    }
     @Bean
     public LocaleResolver localeResolver(){
         return new InitLocaleResolver();

lms/nladmin-system/src/main/java/org/nl/config/language/InitLocaleResolver.java

@@ -1,36 +1,37 @@
-//package org.nl.config.language;
+package org.nl.config.language;
-//
+
-//import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
-//import org.nl.config.MapOf;
+import org.nl.config.MapOf;
-//import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.LocaleResolver;
-//
+
-//import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-//import java.util.Locale;
+import java.util.Locale;
-//import java.util.Map;
+import java.util.Map;
-//
+
-///**
+
-// * s
+public class InitLocaleResolver implements LocaleResolver {
-// * @author ZZQ
+    public static Map<String,String> Language_Country = MapOf.of("id","in-ID","in","in-ID","en-US,en;q=0.9","en-US","en","en-US","zh","zh-CN","ko","ko-KR");
-// * @Date 2023/11/13 09:36
+    public static String language = "";
-// */
+    @Override
-//public class InitLocaleResolver implements LocaleResolver {
+    public Locale resolveLocale(HttpServletRequest request) {
-//    public static Map<String,String> Language_Country = MapOf.of("in","in-ID","en","en-US","zh","zh-CN");
+        String header = request.getHeader("Accept-Language");
-//    @Override
+        if (StringUtils.isNotEmpty(header)){
-//    public Locale resolveLocale(HttpServletRequest request) {
+            String lang = Language_Country.get(header);
-//        String header = request.getHeader("Accept-Language");
+            language = lang;
-//        if (StringUtils.isNotEmpty(header)){
+            if (StringUtils.isNotEmpty(lang)){
-//            String lang = Language_Country.get(header);
+                String[] l = lang.split("-");
-//            if (StringUtils.isNotEmpty(lang)){
+                //印尼的ISO标准国家代码为id-ID
-//                String[] l = lang.split("-");
+                return new Locale(l[0], l[1]);
-//                //印尼的ISO标准国家代码为id-ID
+            }
-//                return new Locale(l[0], l[1]);
+        }
-//            }
+        return Locale.getDefault();
-//        }
+    }
-//        return Locale.getDefault();
+
-//    }
+    @Override
-//
+    public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-//    @Override
+    }
-//    public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+    public String getLanguage(){
-//    }
+        return language;
-//}
+    }
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/classstandard/service/impl/ClassStandardServiceImpl.java

@@ -63,7 +63,7 @@ public class ClassStandardServiceImpl extends ServiceImpl<ClassStandardMapper, C
                         .eq(ClassStandard::getClass_code, entity.getClass_code())
                         .eq(ClassStandard::getIs_delete, false));
         if (ObjectUtil.isNotEmpty(classStandard) && !classStandard.getClass_id().equals(entity.getClass_id())) {
-            throw new BadRequestException(LangProcess.msg("error_ParamExist", entity.getClass_id()));
+            throw new BadRequestException(LangProcess.msg("master_error_ParamExist", entity.getClass_id()));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -113,7 +113,7 @@ public class ClassStandardServiceImpl extends ServiceImpl<ClassStandardMapper, C
                         .eq(ClassStandard::getClass_code, entity.getClass_code())
                         .eq(ClassStandard::getIs_delete, false));
         if (ObjectUtil.isNotEmpty(classStandard) && !classStandard.getClass_id().equals(entity.getClass_id())) {
-            throw new BadRequestException(LangProcess.msg("error_ParamExist", entity.getClass_id()));
+            throw new BadRequestException(LangProcess.msg("master_error_ParamExist", entity.getClass_id()));
         }
         // 查询原来的父id
         String oldPid = dto.getParent_class_id();
@@ -250,12 +250,12 @@ public class ClassStandardServiceImpl extends ServiceImpl<ClassStandardMapper, C
         String parentClassCode = ObjectUtil.isNotEmpty(whereJson.get("parent_class_code"))
                 ? (String) whereJson.get("parent_class_code") : null;
         if (null == parentClassCode) {
-            throw new BadRequestException("父节点编号不能为空!");
+            throw new BadRequestException(LangProcess.msg("master_parentCode_notNull"));
         }
         List<ClassStandard> classstandards = classStandardMapper.selectList(
                 new LambdaQueryWrapper<ClassStandard>().eq(ClassStandard::getClass_code, parentClassCode));
         if (classstandards.size() == 0) {
-            throw new BadRequestException("请输入正确的父节点编号!");
+            throw new BadRequestException(LangProcess.msg("master_parentCode_input"));
         }
         // 处理数据
         classstandards.forEach(classstandard -> {

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/customer/service/impl/CustomerbaseServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.customer.service.CustomerbaseService;
 import org.nl.wms.basedata.master.customer.service.dao.Customerbase;
@@ -56,7 +57,7 @@ public class CustomerbaseServiceImpl extends ServiceImpl<CustomerbaseMapper, Cus
         lam.eq(Customerbase::getIs_delete,"0");
         Customerbase customer = customerbaseMapper.selectOne(lam);
         if (ObjectUtil.isNotEmpty(customer)) {
-            throw new BadRequestException("已存在相同的客户编号！");
+            throw new BadRequestException(LangProcess.msg("master_exists"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -79,7 +80,7 @@ public class CustomerbaseServiceImpl extends ServiceImpl<CustomerbaseMapper, Cus
         lam.ne(Customerbase::getCust_id,dto.getCust_id());
         Customerbase customer = customerbaseMapper.selectOne(lam);
         if (ObjectUtil.isNotEmpty(customer)) {
-            throw new BadRequestException("已存在相同的客户编号！");
+            throw new BadRequestException(LangProcess.msg("master_exists"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/interfaceback/service/impl/InterfaceBackServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.interfaceback.service.IInterfaceBackService;
 import org.nl.wms.basedata.master.interfaceback.service.dao.InterfaceBack;
@@ -59,7 +60,7 @@ public class InterfaceBackServiceImpl extends ServiceImpl<InterfaceBackMapper, I
     public void create(InterfaceBack dto) {
         InterfaceBack one = findByCode(dto.getInterface_name());
         if (ObjectUtil.isNotEmpty(one)) {
-            throw new BadRequestException("接口重复!");
+            throw new BadRequestException(LangProcess.msg("master_jk_exists"));
         }
         dto.setInterface_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         String result = Arrays.toString(dto.getProduct_areas());
@@ -72,11 +73,11 @@ public class InterfaceBackServiceImpl extends ServiceImpl<InterfaceBackMapper, I
     public void update(InterfaceBack dto) {
         InterfaceBack entity = this.getById(dto.getInterface_id());
         if (entity == null) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
+            throw new BadRequestException(LangProcess.msg("master_operation_permissions"));
         }
         InterfaceBack one = findByCode(dto.getInterface_name());
         if (ObjectUtil.isNotEmpty(one) && !one.getInterface_id().equals(dto.getInterface_id())) {
-            throw new BadRequestException("接口重复!");
+            throw new BadRequestException(LangProcess.msg("master_jk_exists"));
         }
         String result = Arrays.toString(dto.getProduct_areas());
         result = result.replaceAll(" ", "");

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/materialbase/service/impl/MaterialbaseServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.materialbase.service.dao.Materialbase;
 import org.nl.wms.basedata.master.materialbase.service.dao.mapper.MaterialbaseMapper;
@@ -58,7 +59,7 @@ public class MaterialbaseServiceImpl extends ServiceImpl<MaterialbaseMapper, Mat
         lam.eq(Materialbase::getIs_delete,"0");
         Materialbase materialbase = materialbaseMapper.selectOne(lam);
         if (ObjectUtil.isNotEmpty(materialbase)) {
-            throw new BadRequestException("已存在相同的物料编号！");
+            throw new BadRequestException(LangProcess.msg("master_vehicle"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -82,7 +83,7 @@ public class MaterialbaseServiceImpl extends ServiceImpl<MaterialbaseMapper, Mat
         lam.ne(Materialbase::getMaterial_id,dto.getMaterial_id());
         Materialbase materialbase = materialbaseMapper.selectOne(lam);
         if (ObjectUtil.isNotEmpty(materialbase)) {
-            throw new BadRequestException("已存在相同的物料编号！");
+            throw new BadRequestException(LangProcess.msg("master_vehicle"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/cotroller/SalesController.java

@@ -3,6 +3,7 @@ package org.nl.wms.basedata.master.sales.cotroller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.wms.basedata.master.sales.service.SalesService;
@@ -30,8 +31,8 @@ public class SalesController {
     @GetMapping
     @Log("查询业务员")
 
-    public ResponseEntity<Object> query(@RequestParam SalesQuery whereJson, PageQuery page) {
+    public ResponseEntity<Object> query(SalesQuery whereJson, PageQuery page) {
-        return new ResponseEntity<>(salesService.queryAll(whereJson, page), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(salesService.queryAll(whereJson, page)), HttpStatus.OK);
     }
 
     @PostMapping

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sales/service/impl/SalesServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.sales.service.SalesService;
 import org.nl.wms.basedata.master.sales.service.dao.Sales;
@@ -58,7 +59,7 @@ public class SalesServiceImpl extends ServiceImpl<SalesMapper, Sales> implements
         Sales salesByCode = salesMapper.selectOne(lam);
         if (salesByCode != null) {
             if (salesByCode.getArea().equals(dto.getArea())) {
-                throw new BadRequestException("存在相同区域的业务员!");
+                throw new BadRequestException(LangProcess.msg("master_area_exists"));
             }
         }
         Sales sales = new Sales();
@@ -73,13 +74,13 @@ public class SalesServiceImpl extends ServiceImpl<SalesMapper, Sales> implements
         lam.eq(Sales::getSales_id, dto.getSales_id());
         Sales salesById = salesMapper.selectOne(lam);
         if (salesById == null) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
+            throw new BadRequestException(LangProcess.msg("master_operation_permissions"));
         }
         LambdaQueryWrapper<Sales> lamCode = new LambdaQueryWrapper<Sales>();
         lamCode.eq(Sales::getSales_id, dto.getSales_code());
         Sales salesByCode = salesMapper.selectOne(lamCode);
         if (salesByCode != null && !salesByCode.getSales_id().equals(dto.getSales_id())) {
-            throw new BadRequestException("存在相同的编码");
+            throw new BadRequestException(LangProcess.msg("master_vehicle"));
         }
         Sales sales = new Sales();
         BeanUtils.copyProperties(dto, sales);

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storagevehicleinfo/service/impl/StoragevehicleinfoServiceImpl.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.system.service.coderule.impl.SysCodeRuleServiceImpl;
 import org.nl.wms.basedata.master.classstandard.service.IClassStandardService;
@@ -71,7 +72,7 @@ public class  StoragevehicleinfoServiceImpl extends ServiceImpl<Storagevehiclein
     @Override
     public Storagevehicleinfo getInfoByCode(String code){
         if (StrUtil.isEmpty(code)) {
-            throw new BadRequestException("载具编码不能为空！");
+            throw new BadRequestException(LangProcess.msg("master_code_notNull"));
         }
         LambdaQueryWrapper<Storagevehicleinfo> lam = new LambdaQueryWrapper<Storagevehicleinfo>();
         lam.eq(Storagevehicleinfo::getStoragevehicle_code,code)
@@ -82,7 +83,7 @@ public class  StoragevehicleinfoServiceImpl extends ServiceImpl<Storagevehiclein
     @Override
     public Storagevehicleex getExtByCode(String code){
         if (StrUtil.isEmpty(code)) {
-            throw new BadRequestException("载具编码不能为空！");
+            throw new BadRequestException(LangProcess.msg("master_code_notNull"));
         }
         LambdaQueryWrapper<Storagevehicleex> lam = new LambdaQueryWrapper<Storagevehicleex>();
         lam.eq(Storagevehicleex::getStoragevehicle_code,code);
@@ -126,7 +127,7 @@ public class  StoragevehicleinfoServiceImpl extends ServiceImpl<Storagevehiclein
                 break;
         }
         if (StrUtil.isEmpty(code)) {
-            throw new BadRequestException("请选择正确的载具类型！");
+            throw new BadRequestException(LangProcess.msg("master_vehicle"));
         }
         JSONArray resultCodeArr = new JSONArray();
         int num = Integer.valueOf(map.getNum());

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/dao/TransportationBase.java

@@ -35,8 +35,8 @@ public class TransportationBase {
     private String create_id;
     private String create_name;
     private String create_time;
-    private String update_id;
+    private String update_optid;
-    private String update_name;
+    private String update_optname;
     private String update_time;
     private Boolean is_used_time;
     private Boolean is_used;

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/transport/service/impl/TransportationBaseServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.transport.service.ITransportationBaseService;
 import org.nl.wms.basedata.master.transport.service.dao.TransportationBase;
@@ -57,7 +58,7 @@ public class TransportationBaseServiceImpl extends ServiceImpl<TransportationBas
     public void create(TransportationBase dto) {
         TransportationBase oneTran = findByCode(dto.getCust_code());
         if (ObjectUtil.isNotEmpty(oneTran)) {
-            throw new BadRequestException("此编码已存在");
+            throw new BadRequestException(LangProcess.msg("master_exists"));
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
@@ -66,8 +67,8 @@ public class TransportationBaseServiceImpl extends ServiceImpl<TransportationBas
         dto.setCust_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
-        dto.setUpdate_id(currentUserId);
+        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_name(nickName);
+        dto.setUpdate_optname(nickName);
         dto.setUpdate_time(now);
         dto.setCreate_time(now);
 
@@ -78,7 +79,7 @@ public class TransportationBaseServiceImpl extends ServiceImpl<TransportationBas
     public void update(TransportationBase dto) {
         TransportationBase oneTran = getById(dto.getCust_id());
         if (oneTran == null) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
+            throw new BadRequestException(LangProcess.msg("master_operation_permissions"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -86,8 +87,8 @@ public class TransportationBaseServiceImpl extends ServiceImpl<TransportationBas
 
         String now = DateUtil.now();
         dto.setUpdate_time(now);
-        dto.setUpdate_id(currentUserId);
+        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_name(nickName);
+        dto.setUpdate_optname(nickName);
         transportationBaseMapper.updateById(dto);
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/cotroller/UnitController.java

@@ -3,6 +3,7 @@ package org.nl.wms.basedata.master.unit.cotroller;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 
@@ -33,8 +34,8 @@ public class UnitController {
     @Log("查询计量单位")
 
     //@PreAuthorize("@el.check('Unit:list')")
-    public ResponseEntity<Object> query(@RequestParam UnitQuery whereJson, PageQuery page) {
+    public ResponseEntity<Object> query(UnitQuery whereJson, PageQuery page) {
-        return new ResponseEntity<>(unitService.queryAll(whereJson, page), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(unitService.queryAll(whereJson, page)), HttpStatus.OK);
     }
 
     @PostMapping

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/unit/service/impl/UnitServiceImpl.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.basedata.master.unit.service.UnitService;
 import org.nl.wms.basedata.master.unit.service.dao.Unit;
@@ -54,7 +55,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit>  implements U
     @Override
     public Unit queryByCode(String unit_code){
         if (ObjectUtil.isEmpty(unit_code)) {
-            throw new BadRequestException("单位编码不能为空!");
+            throw new BadRequestException(LangProcess.msg("master_code_notNull"));
         }
         LambdaQueryWrapper<Unit> lam = new LambdaQueryWrapper<Unit>();
         lam.eq(Unit::getIs_used, "1")
@@ -72,7 +73,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit>  implements U
     public void create(UnitDto dto) {
         Unit unit = this.queryByCode(dto.getUnit_code());
         if (unit != null && "0".equals(unit.getIs_delete())) {
-            throw new BadRequestException("存在相同的编码");
+            throw new BadRequestException(LangProcess.msg("master_exists"));
         }
 
         String currentUserId = SecurityUtils.getCurrentUserId();
@@ -100,11 +101,11 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit>  implements U
         lam.eq(Unit::getMeasure_unit_id, dto.getMeasure_unit_id());
         Unit unitById = unitMapper.selectOne(lam);
         if (unitById == null) {
-            throw new BadRequestException("被删除或无权限，操作失败!");
+            throw new BadRequestException(LangProcess.msg("master_operation_permissions"));
         }
         Unit unitByCode = this.queryByCode(dto.getUnit_code());
         if (unitByCode != null && !unitByCode.getMeasure_unit_id().equals(dto.getMeasure_unit_id())&&"0".equals(unitByCode.getIs_delete())) {
-            throw new BadRequestException("存在相同的编码");
+            throw new BadRequestException(LangProcess.msg("master_exists"));
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();

lms/nladmin-system/src/main/resources/config/application.yml

@@ -4,7 +4,7 @@ server:
     relaxed-path-chars: [ '|','{','}','[',']' ]  #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118
 spring:
   messages:
-    basename: language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
+    basename: language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal,language/master/master
   freemarker:
     check-template-location: false
   profiles:

lms/nladmin-system/src/main/resources/language/master/master.properties

@@ -0,0 +1,14 @@
+master_operation_permissions=被删除或无权限，操作失败!
+master_exists=存在相同的编码!
+master_code_notNull=编码不能为空!
+master_vehicle=请选择正确的载具类型
+master_area_exists=存在相同区域的业务员!
+master_jk_exists=接口重复!
+master_parentCode_notNull=父节点编号不能为空!
+master_parentCode_input=请输入正确的父节点编号!
+master_error_ParamExist={0}已存在
+
+
+
+
+

lms/nladmin-system/src/main/resources/language/master/master_en_US.properties

@@ -0,0 +1,2 @@
+master_operation_permissions=Deleted or without permission, operation failed!
+master_exists=Same encoding exists

lms/nladmin-system/src/main/resources/language/master/master_in_ID.properties

@@ -0,0 +1,3 @@
+master_operation_permissions=Dihapus atau tanpa izin, operasi gagal!
+master_exists=Pengekodan yang sama ada
+

lms/nladmin-system/src/main/resources/language/master/master_zh_CN.properties

@@ -0,0 +1,2 @@
+master_operation_permissions=被删除或无权限，操作失败!
+master_exists=存在相同的编码

lms/nladmin-ui/src/components/Crud/CRUD.operation.vue

@@ -24,7 +24,7 @@
         :disabled="crud.selections.length !== 1"
         @click="crud.toEdit(crud.selections[0])"
       >
-        修改
+        {{ $t('auto.common.Update') }}
       </el-button>
       <el-button
         v-if="crud.optShow.del"
@@ -38,7 +38,7 @@
         :disabled="crud.selections.length === 0"
         @click="toDelete(crud.selections)"
       >
-        删除
+        {{ $t('auto.common.Delete') }}
       </el-button>
       <el-button
         v-if="crud.optShow.download"
@@ -49,7 +49,7 @@
         type="warning"
         icon="el-icon-download"
         @click="crud.doExport"
-      >导出</el-button>
+      > {{ $t('auto.common.Export') }}</el-button>
       <!--右侧-->
       <slot name="right" />
     </span>
@@ -86,7 +86,7 @@
           :indeterminate="allColumnsSelectedIndeterminate"
           @change="handleCheckAllChange"
         >
-          全选
+          {{ $t('auto.common.SelectAll') }}
         </el-checkbox>
         <el-checkbox
           v-for="item in tableColumns"
@@ -190,9 +190,9 @@ export default {
       this.tableColumns = columns
     },
     toDelete(datas) {
-      this.$confirm(`确认删除选中的${datas.length}条数据?`, '提示', {
+      this.$confirm(this.$t('auto.common.Tip1') + `${datas.length}` + this.$t('auto.common.Tip2'), this.$t('auto.common.Tips'), {
-        confirmButtonText: '确定',
+        confirmButtonText: this.$t('auto.common.Confirm'),
-        cancelButtonText: '取消',
+        cancelButtonText: this.$t('auto.common.Cancel'),
         type: 'warning'
       }).then(() => {
         this.crud.delAllLoading = true

lms/nladmin-ui/src/components/Crud/RR.operation.vue

@@ -5,9 +5,9 @@
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
     -->
     <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
-      <i class="el-icon-search el-icon--left" />查询
+      <i class="el-icon-search el-icon--left" />{{ $t('auto.common.Query') }}
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">重置</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">{{ $t('auto.common.Reset') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 

lms/nladmin-ui/src/components/Crud/UD.operation.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">修改</el-button>
+    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">{{ $t('auto.common.Update') }}</el-button>
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="doCancel">取消</el-button>
+        <el-button size="mini" type="text" @click="doCancel">{{ $t('auto.common.Cancel') }}</el-button>
-        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
+        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">{{ $t('auto.common.Confirm') }}</el-button>
       </div>
-      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">删除</el-button>
+      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">{{ $t('auto.common.Delete') }}</el-button>
     </el-popover>
 
   </div>

lms/nladmin-ui/src/i18n/langs/basedata/master/classstandard/in.js

@@ -12,7 +12,7 @@ export default {
       'operate': 'operasi',
       'yes': 'ya',
       'no': 'Tidak',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'is_update': 'Bisakah ia diubah'
     },

lms/nladmin-ui/src/i18n/langs/basedata/master/customer/in.js

@@ -20,7 +20,7 @@ export default {
       'operate': 'operasi',
       'yes': 'ya',
       'no': 'Tidak',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'is_update': 'Bisakah ia diubah'
     },

lms/nladmin-ui/src/i18n/langs/basedata/master/faultdevice/in.js

@@ -11,7 +11,7 @@ export default {
       'update_name': 'Diubah oleh',
       'update_time': 'Ubah waktu',
       'operate': 'operasi',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan'
     },
     'placeholder': {

lms/nladmin-ui/src/i18n/langs/basedata/master/interfaceback/in.js

@@ -10,7 +10,7 @@ export default {
       'business_comment': 'Deskripsi Bisnis',
       'yes': 'ya',
       'no': 'Tidak',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
       'is_enable': 'Apakah diaktifkan',

lms/nladmin-ui/src/i18n/langs/basedata/master/material/en.js

@@ -30,7 +30,11 @@ export default {
       'please_select': 'Please select'
     },
     'msg': {
-      'isNotEmpty': 'Cannot be empty'
+      'isNotEmpty': 'Cannot be empty',
+      'this_operate': 'This operation will "',
+      'is_continue': ', Do you want to continue？',
+      'prompt': 'prompt',
+      'success': 'success'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/material/in.js

@@ -12,7 +12,7 @@ export default {
       'remark': 'komentar',
       'yes': 'ya',
       'no': 'Tidak',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
       'is_enable': 'Apakah diaktifkan',
@@ -30,7 +30,11 @@ export default {
       'please_select': 'Silakan pilih'
     },
     'msg': {
-      'isNotEmpty': 'Tidak dapat kosong'
+      'isNotEmpty': 'Tidak dapat kosong',
+      'this_operate': 'Operasi ini akan "',
+      'is_continue': ', Apakah Anda ingin melanjutkan？',
+      'prompt': 'Tip',
+      'success': 'sukses'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/material/zh.js

@@ -30,7 +30,11 @@ export default {
       'please_select': '请选择'
     },
     'msg': {
-      'isNotEmpty': '不能为空'
+      'isNotEmpty': '不能为空',
+      'this_operate': '此操作将 "',
+      'is_continue': ', 是否继续？',
+      'prompt': '提示',
+      'success': '成功'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/measure/en.js

@@ -27,7 +27,11 @@ export default {
       'input': 'Enter the unit code or unit name'
     },
     'msg': {
-      'isNotEmpty': 'Cannot be empty'
+      'isNotEmpty': 'Cannot be empty',
+      'this_operate': 'This operation will "',
+      'is_continue': ', Do you want to continue？',
+      'prompt': 'prompt',
+      'success': 'success'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/measure/in.js

@@ -7,9 +7,11 @@ export default {
       'ext_id': 'Identifikasi luar',
       'qty_precision': 'akurasi data',
       'desc': 'Teks Huraian',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
+      'yes': 'ya',
+      'no': 'Tidak',
       'is_enable': 'Apakah diaktifkan',
       'is_delete': 'Apakah Anda ingin menghapusnya',
       'create_name': 'Pencipta',
@@ -22,7 +24,11 @@ export default {
       'input': 'Masukkan kode unit atau nama unit'
     },
     'msg': {
-      'isNotEmpty': 'Tidak dapat kosong'
+      'isNotEmpty': 'Tidak dapat kosong',
+      'this_operate': 'Operasi ini akan "',
+      'is_continue': ', Apakah Anda ingin melanjutkan？',
+      'prompt': 'Tip',
+      'success': 'sukses'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/measure/zh.js

@@ -11,6 +11,8 @@ export default {
       'cancel': '取消',
       'enable': '启用',
       'is_enable': '是否启用',
+      'yes': '是',
+      'no': '否',
       'update_name': '修改人',
       'update_time': '修改时间',
       'operate': '操作'
@@ -20,7 +22,11 @@ export default {
       'input': '输入单位编码或单位名称'
     },
     'msg': {
-      'isNotEmpty': '不能为空'
+      'isNotEmpty': '不能为空',
+      'this_operate': '此操作将 "',
+      'is_continue': ', 是否继续？',
+      'prompt': '提示',
+      'success': '成功'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/sales/in.js

@@ -5,7 +5,7 @@ export default {
       'sales_code': 'kode',
       'sales_name': 'nama',
       'area': 'daerah',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
       'is_enable': 'Apakah diaktifkan',

lms/nladmin-ui/src/i18n/langs/basedata/master/storagevehicleinfo/in.js

@@ -9,7 +9,7 @@ export default {
       'vehicle_id': 'Identifikasi kendaraan',
       'yes': 'ya',
       'no': 'Tidak',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
       'is_enable': 'Apakah diaktifkan',

lms/nladmin-ui/src/i18n/langs/basedata/master/transport/en.js

@@ -1,6 +1,6 @@
 export default {
-  'supplier': {
+  'transportation': {
-    'title': 'supplier',
+    'title': 'Basic information of transportation company',
     'dialog': {
       'name': 'Logistics company name',
       'code': 'Logistics company code',
@@ -20,11 +20,14 @@ export default {
       'zip_code': 'Postal Code',
       'remark': 'remark',
       'enable': 'enable',
+      'deactivate': 'deactivate',
       'ext_id': 'External identification',
       'class_basic': 'Basic Classification',
       'telephone': 'company phone',
       'update_name': 'Modified by',
       'update_time': 'Change time',
+      'create_name': 'Creator',
+      'create_time': 'Creation time',
       'operate': 'operation',
       'yes': 'yes',
       'no': 'no',
@@ -42,7 +45,11 @@ export default {
       'import': 'import'
     },
     'msg': {
-      'isNotEmpty': 'Cannot be empty'
+      'isNotEmpty': 'Cannot be empty',
+      'this_operate': 'This operation will "',
+      'is_continue': ', Do you want to continue？',
+      'prompt': 'prompt',
+      'success': 'success'
     }
   }
 }

lms/nladmin-ui/src/i18n/langs/basedata/master/transport/in.js

@@ -20,9 +20,10 @@ export default {
       'zip_code': 'Kode Postal',
       'remark': 'remarks',
       'telephone': 'Nomor Kantor Perusahaan',
-      'confirm': 'confirm',
+      'confirm': 'konfirmasi',
       'cancel': 'batalkan',
       'enable': 'Aktifkan',
+      'deactivate': 'Berhenti menggunakan',
       'is_enable': 'Apakah diaktifkan',
       'create_name': 'Pencipta',
       'create_time': 'Waktu penciptaan',
@@ -38,7 +39,11 @@ export default {
       'please_select': 'Silakan pilih'
     },
     'msg': {
-      'isNotEmpty': 'Tidak dapat kosong'
+      'isNotEmpty': 'Tidak dapat kosong',
+      'this_operate': 'Operasi ini akan "',
+      'is_continue': ', Apakah Anda ingin melanjutkan？',
+      'prompt': 'Tip',
+      'success': 'sukses'
     }
   }
 

lms/nladmin-ui/src/i18n/langs/basedata/master/transport/zh.js

@@ -20,8 +20,11 @@ export default {
       'zip_code': '邮政编码',
       'remark': '备注',
       'telephone': '公司电话',
+      'create_name': '创建人',
+      'create_time': '创建时间',
       'update_name': '修改者',
       'enable': '启用',
+      'deactivate': '停用',
       'update_time': '修改时间',
       'operate': '操作',
       'yes': '是',
@@ -38,7 +41,11 @@ export default {
       'please_select': '请选择'
     },
     'msg': {
-      'isNotEmpty': '不能为空'
+      'isNotEmpty': '不能为空',
+      'this_operate': '此操作将 "',
+      'is_continue': ', 是否继续？',
+      'prompt': '提示',
+      'success': '成功'
     }
   }
 

lms/nladmin-ui/src/i18n/langs/chinese.js

@@ -7,6 +7,11 @@ import classstandard from './basedata/master/classstandard/zh'
 import material from './basedata/master/material/zh'
 import customer from './basedata/master/customer/zh'
 import faultdevice from './basedata/master/faultdevice/zh'
+import interfaceback from './basedata/master/interfaceback/zh'
+import measure from './basedata/master/measure/zh'
+import sales from './basedata/master/sales/zh'
+import storagevehicleinfo from './basedata/master/storagevehicleinfo/zh'
+import transport from './basedata/master/transport/zh'
 import taskConfig from './sch/task/zh'
 import SchBasePoint from './sch/point/zh'
 import taskManage from './sch/task_manage/zh'
@@ -93,6 +98,12 @@ export default {
   ...stage,
   ...classstandard,
   ...customer,
-  ...faultdevice
+  ...faultdevice,
+  ...interfaceback,
+  ...material,
+  ...measure,
+  ...sales,
+  ...storagevehicleinfo,
+  ...transport
 }
 

lms/nladmin-ui/src/i18n/langs/english.js

@@ -8,6 +8,11 @@ import classification from './basedata/classification/en'
 import classstandard from './basedata/master/classstandard/en'
 import customer from './basedata/master/customer/en'
 import faultdevice from './basedata/master/faultdevice/en'
+import interfaceback from './basedata/master/interfaceback/en'
+import measure from './basedata/master/measure/en'
+import sales from './basedata/master/sales/en'
+import storagevehicleinfo from './basedata/master/storagevehicleinfo/en'
+import transport from './basedata/master/transport/en'
 import taskConfig from './sch/task/en'
 import taskManage from './sch/task_manage/en'
 import SchBasePoint from './sch/point/en'
@@ -93,6 +98,12 @@ export default {
   ...stage,
   ...classstandard,
   ...customer,
-  ...faultdevice
+  ...faultdevice,
+  ...interfaceback,
+  ...material,
+  ...measure,
+  ...sales,
+  ...storagevehicleinfo,
+  ...transport
 }
 

lms/nladmin-ui/src/i18n/langs/indonesian.js

@@ -8,6 +8,11 @@ import material from './basedata/master/material/in'
 import classstandard from './basedata/master/classstandard/in'
 import customer from './basedata/master/customer/in'
 import faultdevice from './basedata/master/faultdevice/in'
+import interfaceback from './basedata/master/interfaceback/in'
+import measure from './basedata/master/measure/in'
+import sales from './basedata/master/sales/in'
+import storagevehicleinfo from './basedata/master/storagevehicleinfo/in'
+import transport from './basedata/master/transport/in'
 // import taskConfig from './sch/task/in'
 // import taskManage from './sch/task_manage/in'
 // import SchBasePoint from './sch/point/in'
@@ -93,5 +98,11 @@ export default {
   ...stage,
   ...classstandard,
   ...customer,
-  ...faultdevice
+  ...faultdevice,
+  ...interfaceback,
+  ...material,
+  ...measure,
+  ...sales,
+  ...storagevehicleinfo,
+  ...transport
 }

lms/nladmin-ui/src/utils/request.js

@@ -17,10 +17,12 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(
   config => {
+    const lang = localStorage.getItem('lang')
     if (getToken()) {
       config.headers['Authorization'] = 'Bearer ' + getToken()
     }
     config.headers['Content-Type'] = 'application/json'
+    config.headers['Accept-Language'] = lang
     return config
   },
   error => {

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

@@ -54,8 +54,8 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('material.dialog.is_enable')" prop="is_used">
-            <el-radio v-model="form.is_used" label="0">{{ $t('material.dialog.no') }}</el-radio>
+            <el-radio v-model="form.is_used" :label="0">{{ $t('material.dialog.no') }}</el-radio>
-            <el-radio v-model="form.is_used" label="1">{{ $t('material.dialog.yse') }}</el-radio>
+            <el-radio v-model="form.is_used" :label="1">{{ $t('material.dialog.yse') }}</el-radio>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -178,13 +178,13 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
+      this.$confirm(this.$t('material.msg.this_operate') + this.dict.label.is_used[val] + '" ' + data.material_name + this.$t('material.msg.is_continue'), this.$t('material.msg.prompt'), {
-        confirmButtonText: '确定',
+        confirmButtonText: this.$t('material.dialog.confirm'),
-        cancelButtonText: '取消',
+        cancelButtonText: this.$t('material.dialog.cancel'),
         type: 'warning'
       }).then(() => {
         crudMaterialbase.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify(this.dict.label.is_used[val] + this.$t('material.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(() => {
           if (data.is_used === '0') {
             data.is_used = '1'

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

@@ -31,8 +31,8 @@
             <el-input-number v-model="form.qty_precision" :min="1" :max="6" :label="$t('measure.dialog.desc')" style="width: 150px;" @change="handleChange" />
           </el-form-item>
           <el-form-item :label="$t('measure.dialog.is_enable')" prop="is_used">
-            <el-radio v-model="form.is_used" label="0">{{ $t('measure.dialog.no') }}</el-radio>
+            <el-radio v-model="form.is_used" :label="0">{{ $t('measure.dialog.no') }}</el-radio>
-            <el-radio v-model="form.is_used" label="1">{{ $t('measure.dialog.yes') }}</el-radio>
+            <el-radio v-model="form.is_used" :label="1">{{ $t('measure.dialog.yes') }}</el-radio>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -142,13 +142,13 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.unit_name + ', 是否继续？', '提示', {
+      this.$confirm(this.$t('measure.msg.this_operate') + this.dict.label.is_used[val] + '" ' + data.material_name + this.$t('measure.msg.is_continue'), this.$t('measure.msg.prompt'), {
-        confirmButtonText: '确定',
+        confirmButtonText: this.$t('measure.dialog.confirm'),
-        cancelButtonText: '取消',
+        cancelButtonText: this.$t('measure.dialog.cancel'),
         type: 'warning'
       }).then(() => {
         crudMdPbMeasureunit.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.notify(this.dict.label.is_used[val] + this.$t('measure.msg.success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(() => {
           if (data.is_used === '0') {
             data.is_used = '1'

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

@@ -307,11 +307,10 @@ export default {
     },
     // 改变状态
     changeEnabled(data, val) {
-      const tipA = val ? '启用' : '停用'
+      const tipA = val ? this.$t('transportation.dialog.enable') : this.$t('transportation.dialog.deactivate')
-      console.log(data)
+      this.$confirm(this.$t('measure.msg.this_operate') + tipA + '" ' + data.cust_name + this.$t('measure.msg.is_continue'), this.$t('measure.msg.prompt'), {
-      this.$confirm('此操作将 "' + tipA + '" ' + data.cust_name + ', 是否继续？', '提示', {
+        confirmButtonText: this.$t('measure.dialog.confirm'),
-        confirmButtonText: '确定',
+        cancelButtonText: this.$t('measure.dialog.cancel'),
-        cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         crudTransportationbase.edit(data).then(res => {