越南语调整

shkj-admin/src/main/resources/i18n/messages_en_VT.properties

@@ -636,3 +636,51 @@ app\u7BA1\u7406=Qu\u1EA3n l\u00FD \u1EE9ng d\u1EE5ng
 \u6B63\u5728\u51FA\u5E93\u4E2D\u4E0D\u9700\u8981\u4E0B\u53D1\u51FA\u5E93\u4EFB\u52A1=\u0110ang xu\u1EA5t kho, kh\u00F4ng c\u1EA7n ph\u00E1t h\u00E0nh nhi\u1EC7m v\u1EE5 xu\u1EA5t kho
 \u6A21\u5177\u6761\u7801\u4E0D\u5F97\u4E3A\u7A7A=M\u00E3 v\u1EA1ch khu\u00F4n kh\u00F4ng \u0111\u01B0\u1EE3c \u0111\u1EC3 tr\u1ED1ng
 \u6B64\u6A21\u5177\u5728\u5176\u4ED6\u6258\u76D8\u5C1A\u672A\u5B8C\u6210\u6D41\u7A0B\uFF0C\u4E0D\u53EF\u5165\u5E93\u6B64\u6258\u76D8=Khu\u00F4n m\u1EABu n\u00E0y \u0111ang trong pallet kh\u00E1c ch\u01B0a ho\u00E0n th\u00E0nh quy tr\u00ECnh, kh\u00F4ng th\u1EC3 nh\u1EADp kho v\u00E0o pallet n\u00E0y
+
+\u672A\u6267\u884C=Kh\u00F4ng th\u1EF1c hi\u1EC7n
+\u6B63\u5728\u6267\u884C=\u0110ang th\u1EF1c hi\u1EC7n
+\u5DF2\u5165\u5E93=\u0110\u00E3 \u0111\u01B0\u1EE3c l\u01B0u tr\u1EEF
+\u5DF2\u53D6\u6D88=H\u1EE7y b\u1ECF
+\u5F02\u5E38=B\u1EA5t th\u01B0\u1EDDng
+\u7537=Ng\u01B0\u1EDDi \u0111\u00E0n \u00F4ng
+\u5973=Ph\u1EE5 n\u1EEF
+\u672A\u77E5=Ch\u01B0a \u0111\u01B0\u1EE3c bi\u1EBFt \u0111\u1EBFn
+\u9ED8\u8BA4=M\u1EB7c \u0111\u1ECBnh
+\u7CFB\u7EDF=H\u1EC7 th\u1ED1ng
+\u901A\u77E5=Th\u00F4ng b\u00E1o
+\u516C\u544A=Th\u00F4ng b\u00E1o
+\u5173\u95ED=\u0110\u00F3ng c\u1EEDa
+\u4FEE\u6539=S\u1EEDa \u0111\u1ED5i
+\u6388\u6743=Cho ph\u00E9p
+\u5BFC\u5165=Nh\u1EADp kh\u1EA9u
+\u5F3A\u9000=M\u1EA1nh l\u00F9i
+\u751F\u6210\u4EE3\u7801=\u0110\u1EC3 t\u1EA1o ra m\u00E3
+\u6E05\u7A7A\u6570\u636E=D\u1EEF li\u1EC7u tr\u1ED1ng
+\u6210\u529F=Th\u00E0nh c\u00F4ng
+\u5931\u8D25=Th\u1EA5t b\u1EA1i
+\u5165\u5E93=Enter the warehouse
+\u51FA\u5E93=out of warehouse
+\u7A7A\u95F2=R\u1EA3nh r\u1ED7i
+\u6EE1\u4F4D=\u0110\u1EA7y ng\u01B0\u1EDDi
+\u5168\u76D8=Nh\u00ECn v\u00E0o to\u00E0n b\u1ED9
+\u52A8\u76D8=C\u1EED \u0111\u1ED9ng \u0111o \u0111\u1ED9 cao thi\u00EAn th\u1EC3
+\u672A\u4E0B\u53D1=Kh\u00F4ng \u0111\u01B0\u1EE3c ph\u00E1t h\u00E0nh
+\u6267\u884C\u4E2D=Th\u1EF1c hi\u1EC7n
+\u4E0B\u53D1\u5931\u8D25=Ph\u00E1t h\u00E0nh th\u1EA5t b\u1EA1i
+\u542F\u7528=b\u1EADt
+\u7981\u7528=B\u1ECB t\u1EAFt
+\u5B58\u8D27=Kho ch\u1EE9a
+\u4F4E\u6A21\u5177=Ch\u1EBFt th\u1EA5p
+\u5F85\u51FA\u5E93=\u0110i ra ngo\u00E0i
+\u51FA\u5E93\u4E2D=Ra kh\u1ECFi nh\u00E0 kho
+\u5DF2\u51FA\u5E93=\u0110\u00E3 ra kh\u1ECFi nh\u00E0 kho
+\u521D\u59CB\u5316=Kh\u1EDFi \u0111\u1ED9ng
+\u786E\u8BA4\u6267\u884C=X\u00E1c nh\u1EADn vi\u1EC7c th\u1EF1c hi\u1EC7n
+\u4E2D\u6B62=H\u1EE7y b\u1ECF
+\u5DF2\u5B8C\u6210=\u0110\u00E3 ho\u00E0n th\u00E0nh
+\u7ACB\u4F53\u5E93=Nh\u00E0 kho 3d
+\u534A\u6EE1\u4F4D=M\u1ED9t n\u1EEDa \u0111\u1EA7y \u0111\u1EE7
+\u7A7A\u6258\u51FA\u5E93\u4E2D=H\u1ED7 tr\u1EE3 s\u1EA3n ph\u1EA9m n\u00E0o ra kh\u1ECFi nh\u00E0 kho
+\u6A21\u5177\u51FA\u5E93\u4E2D=N\u1EA5m m\u1ED1c ra kh\u1ECFi nh\u00E0 kho
+\u4ED3\u50A8\u7BA1\u7406\u5458=Qu\u1EA3n l\u00FD kho h\u00E0ng
+\u4ED3\u50A8\u7BA1\u7406\u90E8=Qu\u1EA3n l\u00FD kho h\u00E0ng

shkj-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -629,3 +629,51 @@ key\u6761\u7801\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u626B\u63CF=Key barcod
 \u6B63\u5728\u51FA\u5E93\u4E2D\u4E0D\u9700\u8981\u4E0B\u53D1\u51FA\u5E93\u4EFB\u52A1=Outbound in progress, no need to issue outbound task--58
 \u6A21\u5177\u6761\u7801\u4E0D\u5F97\u4E3A\u7A7A=The mold bar code must not be empty--59
 \u6B64\u6A21\u5177\u5728\u5176\u4ED6\u6258\u76D8\u5C1A\u672A\u5B8C\u6210\u6D41\u7A0B\uFF0C\u4E0D\u53EF\u5165\u5E93\u6B64\u6258\u76D8 =This mold has not completed the process in other pallets, and cannot be stored in this pallet --60
+
+\u672A\u6267\u884C=Not performed
+\u6B63\u5728\u6267\u884C=Executing
+\u5DF2\u5165\u5E93=Already storage
+\u5DF2\u53D6\u6D88=Cancelled
+\u5F02\u5E38=abnormal
+\u7537=male
+\u5973=female
+\u672A\u77E5=unknown
+\u9ED8\u8BA4=default
+\u7CFB\u7EDF=system
+\u901A\u77E5=notice
+\u516C\u544A=announcement
+\u5173\u95ED=closure
+\u4FEE\u6539=Revise
+\u6388\u6743=Authorize
+\u5BFC\u5165=import
+\u5F3A\u9000=Quit
+\u751F\u6210\u4EE3\u7801=Generate code
+\u6E05\u7A7A\u6570\u636E=Clear data
+\u6210\u529F=success
+\u5931\u8D25=fail
+\u5165\u5E93=Enter the warehouse
+\u51FA\u5E93=out of warehouse
+\u7A7A\u95F2=idle
+\u6EE1\u4F4D=Full seats
+\u5168\u76D8=overall
+\u52A8\u76D8=moving disk
+\u672A\u4E0B\u53D1=Not issued
+\u6267\u884C\u4E2D=Executing
+\u4E0B\u53D1\u5931\u8D25=Delivery failed
+\u542F\u7528=enable
+\u7981\u7528=Disable
+\u5B58\u8D27=Storage of goods
+\u4F4E\u6A21\u5177=QD
+\u5F85\u51FA\u5E93=Waiting to out of warehouse
+\u51FA\u5E93\u4E2D=Out of warehouse
+\u5DF2\u51FA\u5E93=Already out of warehouse
+\u521D\u59CB\u5316=initialization
+\u786E\u8BA4\u6267\u884C=Confirm execution
+\u4E2D\u6B62=stop
+\u5DF2\u5B8C\u6210=completed
+\u7ACB\u4F53\u5E93=Vertical warehouse
+\u534A\u6EE1\u4F4D=half-full
+\u7A7A\u6258\u51FA\u5E93\u4E2D=Empty stock out of storage
+\u6A21\u5177\u51FA\u5E93\u4E2D=Mold out of the warehouse
+\u4ED3\u50A8\u7BA1\u7406\u5458=Warehouse manager
+\u4ED3\u50A8\u7BA1\u7406\u90E8=Warehouse management department

shkj-system/src/main/java/com/shkj/system/service/impl/BaseBranchServiceImpl.java

@@ -15,6 +15,7 @@ import com.shkj.common.core.page.BaseBranchVo;
 import com.shkj.common.enums.IsDelEnum;
 import com.shkj.common.enums.IsUseEnum;
 import com.shkj.common.exception.ServiceException;
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.common.utils.SecurityUtils;
 import com.shkj.common.utils.StringUtils;
 import com.shkj.system.mapper.BaseBranchMapper;
@@ -242,6 +243,9 @@ public class BaseBranchServiceImpl extends ServiceImpl<BaseBranchMapper, BaseBra
         }
 
         List<BaseBranch> BaseBranch = this.baseMapper.optionBranchByUserName(userName);
+        for (com.shkj.common.core.domain.entity.BaseBranch baseBranch : BaseBranch) {
+            baseBranch.setBranchName(MessageUtils.message(baseBranch.getBranchName()));
+        }
         if (CollectionUtils.isEmpty(BaseBranch)) {
             vo.setStatus(2);
         } else {

shkj-system/src/main/java/com/shkj/system/service/impl/SysDeptServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.system.mapper.SysDeptMapper;
 import com.shkj.system.mapper.SysRoleMapper;
 import com.shkj.system.service.ISysDeptService;
@@ -47,7 +48,11 @@ public class SysDeptServiceImpl implements ISysDeptService
     public List<SysDept> selectDeptList(SysDept dept)
     {
         dept.setBranchId(SecurityUtils.getCurrentBranchId());
-        return deptMapper.selectDeptList(dept);
+        List<SysDept> sysDepts = deptMapper.selectDeptList(dept);
+        for (SysDept sysDept : sysDepts) {
+            sysDept.setDeptName(MessageUtils.message(sysDept.getDeptName()));
+        }
+        return sysDepts;
     }
 
     /**

shkj-system/src/main/java/com/shkj/system/service/impl/SysDictTypeServiceImpl.java

@@ -4,9 +4,11 @@ import com.shkj.common.constant.Constants;
 import com.shkj.common.constant.UserConstants;
 import com.shkj.common.core.domain.entity.SysDictData;
 import com.shkj.common.core.domain.entity.SysDictType;
+import com.shkj.common.core.domain.entity.SysMenu;
 import com.shkj.common.core.redis.RedisCache;
 import com.shkj.common.exception.ServiceException;
 import com.shkj.common.utils.DictUtils;
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.common.utils.SecurityUtils;
 import com.shkj.common.utils.StringUtils;
 import com.shkj.common.utils.spring.SpringUtils;
@@ -76,12 +78,19 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
     public List<SysDictData> selectDictDataByType(String dictType) {
 
         List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
+        for (SysDictData dictData : dictDatas) {
+            dictData.setDictLabel(MessageUtils.message(dictData.getDictLabel()));
+        }
         if (StringUtils.isNotEmpty(dictDatas)) {
             return dictDatas;
         }
         dictDatas = dictDataMapper.selectDictDataByType(dictType, SecurityUtils.getCurrentBranchId());
+
         if (StringUtils.isNotEmpty(dictDatas)) {
             DictUtils.setDictCache(dictType, dictDatas);
+            for (SysDictData dictData : dictDatas) {
+                dictData.setDictLabel(MessageUtils.message(dictData.getDictLabel()));
+            }
             return dictDatas;
         }
         return null;

shkj-system/src/main/java/com/shkj/system/service/impl/SysPostServiceImpl.java

@@ -2,12 +2,14 @@ package com.shkj.system.service.impl;
 
 import java.util.List;
 
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.common.utils.SecurityUtils;
 import com.shkj.system.domain.SysPost;
 import com.shkj.system.mapper.SysPostMapper;
 import com.shkj.system.mapper.SysUserPostMapper;
 import com.shkj.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Service;
 import com.shkj.common.constant.UserConstants;
 import com.shkj.common.exception.ServiceException;
@@ -35,7 +37,12 @@ public class SysPostServiceImpl implements ISysPostService {
     @Override
     public List<SysPost> selectPostList(SysPost post) {
         post.setBranchId(SecurityUtils.getCurrentBranchId());
-        return postMapper.selectPostList(post);
+        List<SysPost> sysPosts = postMapper.selectPostList(post);
+        for (SysPost sysPost : sysPosts) {
+            sysPost.setPostName(MessageUtils.message(sysPost.getPostName()));
+            sysPost.setPostCode(MessageUtils.message(sysPost.getPostCode()));
+        }
+        return sysPosts;
     }
 
     /**

shkj-system/src/main/java/com/shkj/system/service/impl/SysUserServiceImpl.java

@@ -2,9 +2,11 @@ package com.shkj.system.service.impl;
 
 import com.shkj.common.annotation.DataScope;
 import com.shkj.common.constant.UserConstants;
+import com.shkj.common.core.domain.entity.SysDept;
 import com.shkj.common.core.domain.entity.SysRole;
 import com.shkj.common.core.domain.entity.SysUser;
 import com.shkj.common.exception.ServiceException;
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.common.utils.SecurityUtils;
 import com.shkj.common.utils.StringUtils;
 import com.shkj.common.utils.bean.BeanValidators;
@@ -75,7 +77,15 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserList(SysUser user) {
         user.setCurrentBranchId(SecurityUtils.getCurrentBranchId());
         //如果当前是仓库级 过滤掉系统用户
-        return userMapper.selectUserList(user);
+        List<SysUser> sysUserList = userMapper.selectUserList(user);
+        for (SysUser sysUser : sysUserList) {
+            SysDept dept = sysUser.getDept();
+            if (dept !=null){
+                dept.setDeptName(MessageUtils.message(dept.getDeptName()));
+                sysUser.setDept(dept);
+            }
+        }
+        return sysUserList;
     }
 
     /**

shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java

@@ -96,7 +96,7 @@ public class PlcEventTask {
     @Autowired
     PlcInit plcInit;
 
-    @Scheduled(fixedDelay = 8000)
+   // @Scheduled(fixedDelay = 8000)
     public void init() {
         //查询需要连接的PLC,初始化连接对象
         List<WcsPlcConnectVo> plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1"));
@@ -118,7 +118,7 @@ public class PlcEventTask {
 
 
 
-    @Scheduled(fixedDelay = 4000)
+   // @Scheduled(fixedDelay = 4000)
     public void writePlcheartbeat(){
         //根据连接的plcId获取属性
         PlcOperate plcOperate = plcInit.getPlcOperate_dps();

shkj-wms/src/main/java/com/shkj/wms/enums/LanguagesEnum.java

@@ -17,6 +17,7 @@ public enum LanguagesEnum {
      */
     zh_EN ("zh_EN", "中文"),
     en_US ("en_US", "英文"),
+    en_VT("en_VT","越南语")
     ;
 
     private String value;

shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseStorageServiceImpl.java

@@ -9,7 +9,9 @@ import com.github.pagehelper.Page;
 import com.shkj.common.annotation.DataScopeConsignor;
 import com.shkj.common.core.domain.Result;
 import com.shkj.common.core.domain.entity.BaseBranch;
+import com.shkj.common.core.domain.entity.SysDictData;
 import com.shkj.common.enums.IsDelEnum;
+import com.shkj.common.utils.MessageUtils;
 import com.shkj.common.utils.SecurityUtils;
 import com.shkj.common.utils.StringUtils;
 import com.shkj.wms.domain.BaseStorage;
@@ -104,7 +106,11 @@ public class BaseStorageServiceImpl extends ServiceImpl<BaseStorageMapper, BaseS
     @Override
     @DataScopeConsignor(branchAlias = "bs")
     public List<BaseStorageVo> queryBaseStorageList(BaseStorageQueryListBo bo) {
-        return this.getBaseMapper().queryBaseStorageList(bo);
+        List<BaseStorageVo> baseStorageVos = this.getBaseMapper().queryBaseStorageList(bo);
+        for (BaseStorageVo baseStorageVo : baseStorageVos) {
+            baseStorageVo.setStorageName(MessageUtils.message(baseStorageVo.getStorageName()));
+        }
+        return baseStorageVos;
     }
 
     public List<BaseStorage> queryBaseStorageByCodes(List<String> codes) {