add:添加国际化配置1

2023-11-15 15:53:55 +08:00
parent 72bcbb36cc
commit 479432c8ae
46 changed files with 282 additions and 108 deletions
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java
@@ -48,6 +48,13 @@ public class DeptVo extends BaseDTO implements Serializable {
    @NotBlank
    @ApiModelProperty(value = "部门名称")
    private String name;
+    @ApiModelProperty(value = "zh部门名称")
+    private String zh_name;
+    @ApiModelProperty(value = "en部门名称")
+    private String en_name;
+
+    @ApiModelProperty(value = "id部门名称")
+    private String in_name;

    @NotNull
    @ApiModelProperty(value = "是否启用")
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebMvcConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebMvcConfig.java
@@ -15,7 +15,10 @@
 */
 package org.nl.config;

+import org.nl.config.language.InitLocaleResolver;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 /**
@@ -27,5 +30,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

-
+    @Bean
+    public LocaleResolver localeResolver(){
+       return new InitLocaleResolver();
+    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java
@@ -1,6 +1,7 @@
 package org.nl.config.language;

 import org.apache.commons.lang3.StringUtils;
+import org.nl.config.MapOf;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.LocaleResolver;
@@ -8,21 +9,24 @@ import org.springframework.web.servlet.LocaleResolver;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Locale;
+import java.util.Map;

 /*
 * @author ZZQ
 * @Date 2023/11/13 09:36
 */
-@Component
 public class InitLocaleResolver implements LocaleResolver {
+    public static Map<String,String> Language_Country = MapOf.of("in","in-ID","en","en-US","zh","zh-CN");
    @Override
    public Locale resolveLocale(HttpServletRequest request) {
        String header = request.getHeader("Accept-Language");
        if (StringUtils.isNotEmpty(header)){
-            String[] split = header.split(",");
-            String[] lang = split[0].split("-");
-            //印尼的ISO标准国家代码为id-ID
-            return new Locale(lang[0], lang[1]==null?"ID":lang[1]);
+            String lang = Language_Country.get(header);
+            if (StringUtils.isNotEmpty(lang)){
+                String[] l = lang.split("-");
+                //印尼的ISO标准国家代码为id-ID
+                return new Locale(l[0], l[1]);
+            }
        }
        return Locale.getDefault();
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/SysDept.java
@@ -40,11 +40,23 @@ public class SysDept implements Serializable {
     * 子部门数目
     */
    private Integer sub_count;
-
    /**
     * 名称
     */
    private String name;
+    /**
+     * 中文名称
+     */
+    private String zh_name;
+    /**
+     * us名称
+     */
+    private String en_name;
+
+    /**
+     * id名称
+     */
+    private String in_name;

    /**
     * 排序
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java
@@ -35,6 +35,9 @@ public class DeptTree implements Serializable {
    private String pid;

    private String name;
+    private String in_name;
+    private String en_name;
+    private String zh_name;
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private List<DeptTree> children;

--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
@@ -59,6 +59,18 @@ public class SysMenu implements Serializable {
     * 菜单标题
     */
    private String title;
+    /**
+     * 菜单标题
+     */
+    private String zh_title;
+    /**
+     * 菜单标题
+     */
+    private String en_title;
+    /**
+     * 菜单标题
+     */
+    private String in_title;

    /**
     * 组件名称
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
@@ -34,6 +34,9 @@ public class MenuDto extends BaseDTO implements Serializable {
    private String permission;

    private String title;
+    private String zh_title;
+    private String en_title;
+    private String in_title;

    private Integer menu_sort;

@@ -90,4 +93,17 @@ public class MenuDto extends BaseDTO implements Serializable {
    public int hashCode() {
        return Objects.hash(menu_id);
    }
+
+    public String getLocalTitle(String local){
+        if ("in".equals(local)){
+            return in_title;
+        }
+        if ("en".equals(local)){
+            return en_title;
+        }
+        if ("zh".equals(local)){
+            return zh_title;
+        }
+        return title;
+    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java
@@ -18,6 +18,6 @@ public class MenuQuery extends BaseQuery<SysMenu> {
    @Override
    public void paramMapping() {
        this.doP.put("pid", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.OREQ).build());
-        this.doP.put("blurry", QParam.builder().k(new String[]{"title"}).type(QueryTEnum.LK).build());
+        this.doP.put("blurry", QParam.builder().k(new String[]{"title","en_title","in_title"}).type(QueryTEnum.LK).build());
    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -28,6 +28,7 @@ import org.nl.system.service.menu.dao.SysMenu;
 import org.nl.system.service.menu.dao.mapper.SysMenuMapper;
 import org.nl.system.service.menu.dto.MenuQuery;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -263,11 +264,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
    @Override
    public List<MenuVo> buildMenus(List<MenuDto> menuDtos) {
        List<MenuVo> list = new LinkedList<>();
+        String lang = LocaleContextHolder.getLocale().getLanguage();
        menuDtos.forEach(menuDTO -> {
                    if (menuDTO != null) {
                        List<MenuDto> menuDtoList = menuDTO.getChildren();
                        MenuVo menuVo = new MenuVo();
-                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle());
+                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getLocalTitle(lang));
                        // 一级目录需要加斜杠，不然会报警告
                        menuVo.setPath(ObjectUtil.isEmpty(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath());
                        menuVo.setHidden(menuDTO.getHidden());
@@ -282,7 +284,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                                menuVo.setComponent(menuDTO.getComponent());
                            }
                        }
-                        menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
+                        menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache()));
                        if (menuDtoList != null && menuDtoList.size() != 0) {
                            menuVo.setAlwaysShow(true);
                            menuVo.setRedirect("noredirect");
@@ -401,12 +403,13 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
    @Override
    public List<MenuVo> buildMenus(List<MenuDto> menuDtos, String pid) {
        List<MenuVo> list = new LinkedList<>();
+        String lang = LocaleContextHolder.getLocale().getLanguage();
        //剔除系统级菜单
        menuDtos.forEach(menuDTO -> {
                    if (menuDTO != null) {
                        List<MenuDto> menuDtoList = menuDTO.getChildren();
                        MenuVo menuVo = new MenuVo();
-                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle());
+                        menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getLocalTitle(lang));
                        // 一级目录需要加斜杠，不然会报警告
                        menuVo.setPath(pid.equals(menuDTO.getPid())? "/" + menuDTO.getPath() : menuDTO.getPath());
                        menuVo.setHidden(menuDTO.getHidden());
@@ -421,7 +424,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                                menuVo.setComponent(menuDTO.getComponent());
                            }
                        }
-                        menuVo.setMeta(new MenuMetaVo(menuDTO.getTitle(), menuDTO.getIcon(), !menuDTO.getCache()));
+                        menuVo.setMeta(new MenuMetaVo(menuDTO.getLocalTitle(lang), menuDTO.getIcon(), !menuDTO.getCache()));
                        if (menuDtoList != null && menuDtoList.size() != 0) {
                            menuVo.setAlwaysShow(true);
                            menuVo.setRedirect("noredirect");
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java
@@ -36,6 +36,18 @@ public class Param implements Serializable {
     * 名称
     */
    private String name;
+    /**
+     * 中文名称
+     */
+    private String zh_name;
+    /**
+     * us名称
+     */
+    private String en_name;
+    /**
+     * id名称
+     */
+    private String in_name;

    /**
     * 值
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -56,7 +56,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
    @Transactional(rollbackFor = Exception.class)
    public void create(SysDataPermission permission) {
        SysDataPermission sysDataPermission = dataPermissionMapper.selectOne(new LambdaQueryWrapper<SysDataPermission>().eq(SysDataPermission::getCode, permission.getCode()));
-        if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在");
+        if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException(LangProcess.msg("error_ParamExist",permission.getCode()));
        String currentUserId = SecurityUtils.getCurrentUserId();
        String nickName = SecurityUtils.getCurrentNickName();
        String now = DateUtil.now();
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
@@ -83,7 +83,7 @@ public class QuartzManage {
            }
        } catch (Exception e){
            log.error("更新定时任务失败", e);
-            throw new BadRequestException("更新定时任务失败");
+            throw new BadRequestException(LangProcess.msg("error_Update"));
        }
    }

@@ -103,7 +103,7 @@ public class QuartzManage {
            scheduler.resumeJob(jobKey);
        } catch (Exception e){
            log.error("恢复定时任务失败", e);
-            throw new BadRequestException("恢复定时任务失败");
+            throw new BadRequestException(LangProcess.msg("error_Update"));
        }
    }

@@ -117,7 +117,7 @@ public class QuartzManage {
            scheduler.pauseJob(jobKey);
        } catch (Exception e){
            log.error("定时任务暂停失败", e);
-            throw new BadRequestException("定时任务暂停失败");
+            throw new BadRequestException(LangProcess.msg("error_Update"));
        }
    }

@@ -139,7 +139,7 @@ public class QuartzManage {
            scheduler.triggerJob(jobKey,dataMap);
        } catch (Exception e){
            log.error("定时任务执行失败", e);
-            throw new BadRequestException("定时任务执行失败");
+            throw new BadRequestException(LangProcess.msg("error_Update"));
        }
    }

@@ -154,7 +154,7 @@ public class QuartzManage {
            scheduler.deleteJob(jobKey);
        } catch (Exception e){
            log.error("删除定时任务失败", e);
-            throw new BadRequestException("删除定时任务失败");
+            throw new BadRequestException(LangProcess.msg("error_Detele"));
        }
    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/dao/SysRole.java
@@ -35,6 +35,19 @@ public class SysRole implements Serializable {
     * 名称
     */
    private String name;
+    /**
+     * 中文名称
+     */
+    private String zh_name;
+    /**
+     * us名称
+     */
+    private String en_name;
+
+    /**
+     * id名称
+     */
+    private String in_name;

    /**
     * 角色级别
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo;
 import org.nl.wms.database.material.service.IMdBaseMaterialService;
@@ -442,7 +443,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
        // 获取工单
        PdmBdWorkorder workorder = pdmBdWorkorderService.getByCode(brickInfo.getWorkorder_code());
        if (ObjectUtil.isEmpty(workorder)) {
-            throw new BadRequestException("工单不存在，上报MES失败");
+            throw new BadRequestException(LangProcess.msg("error_isNull",brickInfo.getWorkorder_code()));
        }
        MdBaseMaterial material = mdBaseMaterialService.getById(workorder.getMaterial_id());
        String singleWeight = material.getSingle_weight();
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -155,7 +155,7 @@ public class PdaServiceImpl implements PdaService {
    @Override
    public PdaResponseVo forcedResting(ForcedRestingDto forcedRestingDto) {
        if (ObjectUtil.isEmpty(forcedRestingDto.getGroup_id())) {
-            throw new BadRequestException("请选择需要设置静置的料盅!");
+            throw new BadRequestException(LangProcess.msg("error_NullPoint"));
        }
        SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(forcedRestingDto.getGroup_id());
        vehiclematerialgroup.setStanding_time(forcedRestingDto.getStand_time());
@@ -183,13 +183,13 @@ public class PdaServiceImpl implements PdaService {
        // 查询工单
        PdmBdWorkorder bdWorkorder = workorderService.getByCode(manualSortingDto.getWorkorder_code());
        if (ObjectUtil.isEmpty(bdWorkorder)) {
-            throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]不存在");
+            throw new BadRequestException(LangProcess.msg("error_isNull",manualSortingDto.getWorkorder_code()));
        }
        switch (bdWorkorder.getWorkorder_status()) {
            case "3":
-                throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]已开工");
+                throw new BadRequestException(LangProcess.msg("error_StatusError",manualSortingDto.getWorkorder_code()));
            case "5":
-                throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]已完工");
+                throw new BadRequestException(LangProcess.msg("error_StatusError",manualSortingDto.getWorkorder_code()));
        }
        // 开工
        bdWorkorder.setOperator(manualSortingDto.getUsername());
@@ -204,13 +204,13 @@ public class PdaServiceImpl implements PdaService {
        // 查询工单
        PdmBdWorkorder bdWorkorder = workorderService.getByCode(manualSortingDto.getWorkorder_code());
        if (ObjectUtil.isEmpty(bdWorkorder)) {
-            throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]不存在");
+            throw new BadRequestException(LangProcess.msg("error_isNull",manualSortingDto.getWorkorder_code()));
        }
        switch (bdWorkorder.getWorkorder_status()) {
            case "1":
-                throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]未开工");
+                throw new BadRequestException(LangProcess.msg("error_StatusError",manualSortingDto.getWorkorder_code()));
            case "5":
-                throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() +  "]已完工");
+                throw new BadRequestException(LangProcess.msg("error_StatusError",manualSortingDto.getWorkorder_code()));
        }
        TaskUtils.setWorkOrderUpdateByPC(bdWorkorder);
        bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.COMPLETE.getCode());
@@ -318,7 +318,7 @@ public class PdaServiceImpl implements PdaService {
    public PdaResponseVo bindingVehicle(VehicleBindingDto vehicleBindingDto) {
        PdmBdWorkorder workOrder = workorderService.getDeviceProductionTask("RGFJ01");
        if (ObjectUtil.isEmpty(workOrder)) {
-            throw new BadRequestException("人工分拣未开工");
+            throw new BadRequestException(LangProcess.msg("error_StatusError","RGFJ01"));
        }
        PdmBdVehicleBinding vehicleBinding = new PdmBdVehicleBinding();
        vehicleBinding.setAssociate_id(IdUtil.getSnowflake(1,1).nextIdStr());
@@ -398,7 +398,7 @@ public class PdaServiceImpl implements PdaService {
        MdBaseMaterial material = materialService.getById(shelfSaveDto.getMaterial_id());
        SchBasePoint basePoint = pointService.getById(shelfSaveDto.getPoint_code());
        if (ObjectUtil.isEmpty(material)) {
-            throw new BadRequestException("物料信息不存在");
+            throw new BadRequestException(LangProcess.msg("material_check",shelfSaveDto.getMaterial_id()));
        }
        SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup();
        group.setGroup_id(IdUtil.getSnowflake(1,1).nextIdStr());
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
@@ -168,14 +168,14 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
    public void submits(PdmBdWorkorder entity) {
        PdmBdWorkorder pdmBdWorkorder = pdmBdWorkorderMapper.selectById(entity.getWorkorder_id());
        if (ObjectUtil.isEmpty(pdmBdWorkorder)) {
-            throw new BadRequestException("工单编码[" + entity.getWorkorder_code() + "]不存在");
+            throw new BadRequestException(LangProcess.msg("workorder_checkNull",entity.getWorkorder_code()));
        }
        // 检验是否已经开工
        if (pdmBdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.PRODUCING.getCode())) {
-            throw new BadRequestException("工单已生产");
+            throw new BadRequestException(LangProcess.msg("workorder_statusError"));
        }
        if (pdmBdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.COMPLETE.getCode())) {
-            throw new BadRequestException("工单已完工");
+            throw new BadRequestException(LangProcess.msg("workorder_statusError"));
        }
        // 查找是否有当前设备已经开工的工单
        LambdaQueryWrapper<PdmBdWorkorder> lam = new QueryWrapper<PdmBdWorkorder>().lambda();
@@ -184,7 +184,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
                .eq(PdmBdWorkorder::getIs_delete, false);
        PdmBdWorkorder bdWorkorder = pdmBdWorkorderMapper.selectOne(lam);
        if (ObjectUtil.isNotEmpty(bdWorkorder)) {
-            throw new BadRequestException("该设备已有生产工单，不能重复下发");
+            throw new BadRequestException(LangProcess.msg("device_orderRun"));
        }
        // 设置开工人
        pdmBdWorkorder.setOperator(ObjectUtil.isNotEmpty(SecurityUtils.getCurrentUser())
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
@@ -117,10 +117,10 @@
 //        // 校验任务
 //        SchBaseTask taskObj = taskService.getByCode(task_code);
 //        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException("该任务已完成!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException("该任务已取消!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        // 获取参数
 //        String startPoint = taskObj.getPoint_code1(); // 获取起点
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
@@ -131,10 +131,10 @@ public class CTQKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -155,7 +155,7 @@ public class CTQKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -164,7 +164,7 @@ public class CTQKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
@@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage.task.tasks.dtk;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
@@ -97,7 +98,7 @@ public class DTSKTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("货架暂无货位存放空托盘！", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("货架暂无货位存放空托盘！");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置终点并修改创建成功状态
        task.setPoint_code2(point.getPoint_code());
@@ -122,10 +123,10 @@ public class DTSKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -146,7 +147,7 @@ public class DTSKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -155,7 +156,7 @@ public class DTSKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
@@ -300,10 +301,10 @@ public class FJMKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -325,7 +326,7 @@ public class FJMKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -334,7 +335,7 @@ public class FJMKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.config.MapOf;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
 import org.nl.wms.ext.acs.service.dto.SignalData;
@@ -194,10 +195,10 @@ public class FJQKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -219,7 +220,7 @@ public class FJQKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -228,7 +229,7 @@ public class FJQKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
 import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
@@ -126,7 +127,7 @@ public class FJQLTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("钢托盘缓存货架没有所需物料!", TASK_CONFIG_CODE + task.getPoint_code2(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("钢托盘缓存货架没有所需物料!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置起点并修改创建成功状态
        task.setPoint_code1(point.getPoint_code());
@@ -166,10 +167,10 @@ public class FJQLTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -190,7 +191,7 @@ public class FJQLTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -199,7 +200,7 @@ public class FJQLTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
 import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
@@ -104,7 +105,7 @@ public class FJQZRKTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("找不到可用的包装位！", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("找不到可用的包装位！");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        String requestParam = task.getRequest_param();
        JSONObject jsonObject = JSONObject.parseObject(requestParam);
@@ -193,10 +194,10 @@ public class FJQZRKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -218,7 +219,7 @@ public class FJQZRKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -227,7 +228,7 @@ public class FJQZRKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
 import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
@@ -251,10 +252,10 @@ public class FJRKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -276,7 +277,7 @@ public class FJRKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -285,7 +286,7 @@ public class FJRKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.mes.service.WmsToMesService;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
@@ -141,10 +142,10 @@ public class FJSKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -178,7 +179,7 @@ public class FJSKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -187,7 +188,7 @@ public class FJSKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
@@ -112,7 +112,7 @@ public class FJSLTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("分拣机械手[" + task.getPoint_code1() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("分拣机械手[" + task.getPoint_code1() + "]未找到所需点位!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置组盘 - 需要的话由子类自行实现
        task.setGroup_id(setGroupPlate(jsonObject));
@@ -148,7 +148,7 @@ public class FJSLTask extends AbstractTask {
        // 查找
        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
        if (vehicleCode == null) {
-            throw new BadRequestException("载具编码不能为空");
+            throw new BadRequestException(LangProcess.msg("vehicle_check"));
        }
        String vehicleType = param.getString("vehicle_type");
        JSONObject stackParameters = param.getJSONObject("palletize"); // 参数
@@ -159,7 +159,7 @@ public class FJSLTask extends AbstractTask {
        SchBaseVehiclematerialgroup groupObject = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
                GroupBindMaterialStatusEnum.BOUND.getValue());
        if (ObjectUtil.isEmpty(groupObject)) {
-            throw new BadRequestException("找不到组盘信息");
+            throw new BadRequestException(LangProcess.msg("vehicle_check_1",vehicleCode));
        }
        groupObject.setIs_full(false);
        groupObject.setMaterial_qty(param.getInteger("qty"));
@@ -174,10 +174,10 @@ public class FJSLTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.database.material.service.dao.MdBaseMaterial;
@@ -74,10 +75,10 @@ public class HNMLTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
@@ -204,7 +205,7 @@ public class HNMLTask extends AbstractTask {
    public void forceFinish(String task_code) { // 人工完成任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -213,7 +214,7 @@ public class HNMLTask extends AbstractTask {
    public void cancel(String task_code) { // 人工取消任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
        // todo： 通知acs取消任务
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
@@ -111,10 +111,10 @@
 //        // 校验任务
 //        SchBaseTask taskObj = taskService.getByCode(task_code);
 //        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException("该任务已完成!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException("该任务已取消!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        // 获取参数
 //        String startPoint = taskObj.getPoint_code1(); // 获取起点
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.mes.service.WmsToMesService;
 import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
@@ -117,7 +118,7 @@ public class CYZCTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("未找到钢托盘缓存区域空位!", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("未找到钢托盘缓存区域空位!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置组盘 - 需要的话由子类自行实现
        task.setGroup_id(setGroupPlate(jsonObject));
@@ -174,10 +175,10 @@ public class CYZCTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -201,7 +202,7 @@ public class CYZCTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -210,7 +211,7 @@ public class CYZCTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.mes.service.WmsToMesService;
 import org.nl.wms.sch.point.service.ISchBasePointService;
@@ -109,7 +110,7 @@ public class GZYQLTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("入窑口[" + task.getPoint_code2() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code2(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("入窑口[" + task.getPoint_code2() + "]未找到所需点位!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置终点并修改创建成功状态
        task.setPoint_code1(point.getPoint_code());
@@ -157,10 +158,10 @@ public class GZYQLTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }

        // 根据传来的类型去对任务进行操作
@@ -184,7 +185,7 @@ public class GZYQLTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -193,7 +194,7 @@ public class GZYQLTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
@@ -140,10 +141,10 @@ public class YZQKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -164,7 +165,7 @@ public class YZQKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -173,7 +174,7 @@ public class YZQKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
@@ -115,10 +115,10 @@
 //        // 校验任务
 //        SchBaseTask taskObj = taskService.getByCode(task_code);
 //        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-//            throw new BadRequestException("该任务已完成!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-//            throw new BadRequestException("该任务已取消!");
+//            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
 //        }
 //        // 获取参数
 //        String startPoint = taskObj.getPoint_code1(); // 起点
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
 import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
@@ -69,7 +70,7 @@ public class YZSKTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("送空盅任务未找到混料机空位!", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("送空盅任务未找到混料机空位!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        log.warn("送空盅找到点位的信息：{}", point);
        // 设置终点并修改创建成功状态
@@ -160,10 +161,10 @@ public class YZSKTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -184,7 +185,7 @@ public class YZSKTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
@@ -193,7 +194,7 @@ public class YZSKTask extends AbstractTask {
    public void cancel(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
@@ -130,7 +130,7 @@ public class YZSLTask extends AbstractTask {
            // 消息通知
            noticeService.createNotice("压机[" + task.getPoint_code1() + "]未找到所需点位!", TASK_CONFIG_CODE + task.getPoint_code1(),
                    NoticeTypeEnum.WARN.getCode());
-            throw new BadRequestException("压机[" + task.getPoint_code1() + "]未找到所需点位!");
+            throw new BadRequestException(LangProcess.msg("point_checkNull"));
        }
        // 设置组盘 - 需要的话由子类自行实现
        task.setGroup_id(setGroupPlate(jsonObject));
@@ -156,7 +156,7 @@ public class YZSLTask extends AbstractTask {
    private SchBasePoint findNextPoint(List<String> nextRegionStr, JSONObject requestParam) {
        // 需要获取nextRegionStr
        if (nextRegionStr.size() < 2) {
-            throw new BadRequestException("压制送料任务的配置文件有错!");
+            throw new BadRequestException(LangProcess.msg("error_Config"));
        }
        String regionCode = nextRegionStr.get(0);
        // 当前设备的工单
@@ -166,7 +166,7 @@ public class YZSLTask extends AbstractTask {
                .eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
                : null;
        if (one == null) {
-            throw new BadRequestException("压制机的工单不能为空!");
+            throw new BadRequestException(LangProcess.msg("workorder_checkRun",workorderCode));
        }
        // 判断是否加急，加急则去窑口，不加急就是去双层缓存输送线
        if (one.getIs_urgent()) {
@@ -207,10 +207,10 @@ public class YZSLTask extends AbstractTask {
        // 校验任务
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
-            throw new BadRequestException("该任务已完成!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
-            throw new BadRequestException("该任务已取消!");
+            throw new BadRequestException(LangProcess.msg("task_statusWrong"));
        }
        // 根据传来的类型去对任务进行操作
        if (status.equals(TaskStatus.EXECUTING)) { // 执行中
@@ -236,7 +236,7 @@ public class YZSLTask extends AbstractTask {
        // 组盘，返回组盘标识，设置待绑定，搬运结束就设置已绑定
        String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
        if (vehicleCode == null) {
-            throw new BadRequestException("载具编码不能为空");
+            throw new BadRequestException(LangProcess.msg("vehicle_check"));
        }
        String vehicleType = param.getString("vehicle_type");
        JSONObject stackParameters = param.getJSONObject("palletize");
@@ -299,7 +299,7 @@ public class YZSLTask extends AbstractTask {
    public void forceFinish(String task_code) {
        SchBaseTask taskObj = taskService.getByCode(task_code);
        if (ObjectUtil.isEmpty(taskObj)) {
-            throw new BadRequestException("该任务不存在");
+            throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
        }
        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
    }
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
@@ -1,5 +1,6 @@
 dept_has=部门存在绑定的人员，请先解绑人员对应部门
 device_check=设备编号不能为空
+device_orderRun=设备工单已在生产
 genrator_cfg=请先配置生成器
 material_cfg=物料{0}配置信息异常,请维护
 material_check=物料ID{0}不存在
@@ -14,4 +15,6 @@ task_isNull=任务信息不存在{0}
 task_statusWrong=任务已完成或已取消
 vehicle_check=载具编码不能为空
 vehicle_check_1=载具{0}组盘信息不存在
+workorder_checkNull=工单不存在{0}
 workorder_checkRun=该设备{0}不在生产中的工单
+workorder_statusError=工单状态不正确
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
@@ -1,5 +1,6 @@
 dept_has=Ada personal terikat di departments Tolong lepaskan departments yang sama dari personal persona 
 device_check=Equipment number cannot be empty  
+device_orderRun=The equipment work order is already in production  
 genrator_cfg=Please configure the generator first  
 material_cfg=Abnormal configuration information for material {0}, please maintain  
 material_check=Item ID {0} does not exist  
@@ -14,4 +15,6 @@ task_isNull=Task information does not exist {0}
 task_statusWrong=Task completed or canceled  
 vehicle_check=Vehicle code cannot be empty  
 vehicle_check_1=The disk information of vehicle {0} does not exist  
+workorder_checkNull=The work order does not exist {0} 
 workorder_checkRun=The equipment {0} is not in production for a work order  
+workorder_statusError=The work order status is incorrect  
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties
@@ -1,5 +1,6 @@
 dept_has=Ada personil terikat di departemen. Tolong lepaskan departemen yang sama dari personil pertama  
 device_check=Nomor peralatan tidak dapat kosong  
+device_orderRun=Perintah kerja peralatan sudah dalam produksi  
 genrator_cfg=Silakan konfigur generator pertama  
 material_cfg=Informasi konfigurasi abnormal untuk material {0}, silakan tetap  
 material_check=ID Item {0} tidak ada  
@@ -14,4 +15,6 @@ task_isNull=Informasi tugas tidak ada {0}
 task_statusWrong=Tugas selesai atau dibatalkan  
 vehicle_check=Kode kendaraan tidak dapat kosong  
 vehicle_check_1=Informasi disk dari kendaraan {0} tidak ada  
+workorder_checkNull=Perintah kerja tidak ada  {0}
 workorder_checkRun=Perangkat {0} tidak dalam produksi untuk perintah kerja  
+workorder_statusError=Status perintah kerja tidak benar  
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
@@ -0,0 +1,20 @@
+dept_has=Ada personil terikat di departemen. Tolong lepaskan departemen yang sama dari personil pertama  
+device_check=Nomor peralatan tidak dapat kosong  
+device_orderRun=Perintah kerja peralatan sudah dalam produksi  
+genrator_cfg=Silakan konfigur generator pertama  
+material_cfg=Informasi konfigurasi abnormal untuk material {0}, silakan tetap  
+material_check=ID Item {0} tidak ada  
+material_notEq=Tidak konsistens materi  
+menu_url=Hubungan luar harus dimulai dengan http\://atau https\://  
+per_auth=Ada izin data terkait, silakan hapuskan setelah pemisahan  
+point_checkNull=Titik tidak dapat kosong  
+point_checkNull_1=Titik awal atau akhir tidak dapat berdua kosong  
+quartz_check=ID tugas saat ini tidak dapat ditambah ke subtask  
+role_Check_1=Nama karakter tidak dapat kosong  
+task_isNull=Informasi tugas tidak ada {0}  
+task_statusWrong=Tugas selesai atau dibatalkan  
+vehicle_check=Kode kendaraan tidak dapat kosong  
+vehicle_check_1=Informasi disk dari kendaraan {0} tidak ada  
+workorder_checkNull=Perintah kerja tidak ada  {0}
+workorder_checkRun=Perangkat {0} tidak dalam produksi untuk perintah kerja  
+workorder_statusError=Status perintah kerja tidak benar  
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
@@ -1,5 +1,6 @@
 dept_has=部门存在绑定的人员，请先解绑人员对应部门
 device_check=设备编号不能为空
+device_orderRun=设备工单已在生产
 genrator_cfg=请先配置生成器
 material_cfg=物料{0}配置信息异常,请维护
 material_check=物料ID{0}不存在
@@ -14,4 +15,6 @@ task_isNull=任务信息不存在{0}
 task_statusWrong=任务已完成或已取消
 vehicle_check=载具编码不能为空
 vehicle_check_1=载具{0}组盘信息不存在
+workorder_checkNull=工单不存在{0}
 workorder_checkRun=该设备{0}不在生产中的工单
+workorder_statusError=工单状态不正确
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
@@ -2,6 +2,7 @@ error_AccessLimit=访问次数限制\!
 error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
 error_Config=配置信息不正确
 error_Create=创建失败
+error_Delete=删除失败
 error_File_1=文件超出规定大小\!
 error_File_2=只能上传图片
 error_File_3=上传失败
@@ -13,6 +14,8 @@ error_ParamError=参数不正确
 error_ParamExist=信息已经存在{0}
 error_Point=点位错误
 error_Send=消息发送失败
+error_StatusError={0}信息状态不正确
 error_SystemAuthError=权限不足，操作失败
 error_SystemError=系统繁忙，稍后在试
+error_Update=更新失败
 error_isNull={0}查询信息不存在
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
@@ -2,6 +2,7 @@ error_AccessLimit=Access limit\!
 error_CodeGenerator=This environment does not allow code generation. Please choose to preview or download to view
 error_Config=Incorrect configuration information  
 error_Create=Creation failed
+error_Delete=Delete failed  
 error_File_1=The file exceeds the specified size\!
 error_File_2=Only uploadable images
 error_File_3=Upload failed  
@@ -13,6 +14,8 @@ error_ParamError=invalid parameter
 error_ParamExist=Parameter already exists {0}
 error_Point=point error
 error_Send=Message sending failed  
+error_StatusError={0} information status is incorrect  
 error_SystemAuthError=Insufficient permissions, operation failed
 error_SystemError=The system is busy, please try again later
+error_Update=Update failed  
 error_isNull={0}query is null
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
@@ -2,6 +2,7 @@ error_AccessLimit=Batas akses\!
 error_CodeGenerator=lingkungan ini tidak memungkinkan generasi kode. Silakan pilih untuk melihat atau mengunduh untuk melihat
 error_Config=Informasi konfigurasi yang salah  
 error_Create=Penciptaan gagal  
+error_Delete=Hapus gagal  
 error_File_1=Berkas melebihi ukuran yang ditentukan\!
 error_File_2=Hanya gambar yang dapat diunggah
 error_File_3=Upload gagal  
@@ -13,6 +14,8 @@ error_ParamError=parameter tidak benar
 error_ParamExist=Parameter sudah ada {0}
 error_Point=Kesalahan titik
 error_Send=Pengiriman pesan gagal  
+error_StatusError=Status informasi {0} tidak benar  
 error_SystemAuthError=Keizinan tidak cukup, operasi gagal
 error_SystemError=Sistemnya sibuk, tolong coba lagi nanti
+error_Update=Kemaskini gagal  
 error_isNull={0}Pertanyaan Tidak ada
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
@@ -0,0 +1,21 @@
+error_AccessLimit=Batas akses\!
+error_CodeGenerator=lingkungan ini tidak memungkinkan generasi kode. Silakan pilih untuk melihat atau mengunduh untuk melihat
+error_Config=Informasi konfigurasi yang salah  
+error_Create=Penciptaan gagal  
+error_Delete=Hapus gagal  
+error_File_1=Berkas melebihi ukuran yang ditentukan\!
+error_File_2=Hanya gambar yang dapat diunggah
+error_File_3=Upload gagal  
+error_LockOut=Operasi kunci sedang sibuk {0}, menunggu akhir  
+error_NotEq=Pengecualian verifikasi parameter\: informasi yang tidak konsisten  
+error_NullPoint=Pertanyaan Hanya Kosong
+error_NumberError_1=Panjangnya bahkan tidak\!
+error_ParamError=parameter tidak benar
+error_ParamExist=Parameter sudah ada {0}
+error_Point=Kesalahan titik
+error_Send=Pengiriman pesan gagal  
+error_StatusError=Status informasi {0} tidak benar  
+error_SystemAuthError=Keizinan tidak cukup, operasi gagal
+error_SystemError=Sistemnya sibuk, tolong coba lagi nanti
+error_Update=Kemaskini gagal  
+error_isNull={0}Pertanyaan Tidak ada
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
@@ -2,6 +2,7 @@ error_AccessLimit=访问次数限制\!
 error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
 error_Config=配置信息不正确
 error_Create=创建失败
+error_Delete=删除失败
 error_File_1=文件超出规定大小\!
 error_File_2=只能上传图片
 error_File_3=上传失败
@@ -13,6 +14,8 @@ error_ParamError=参数不正确
 error_ParamExist=信息已经存在{0}
 error_Point=点位错误
 error_Send=消息发送失败
+error_StatusError={0}信息状态不正确
 error_SystemAuthError=权限不足，操作失败
 error_SystemError=系统繁忙，稍后在试
+error_Update=更新失败
 error_isNull={0}查询信息不存在
--- a/lms/nladmin-system/nlsso-server/src/main/resources/language/login/login_in_ID.properties
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/language/login/login_in_ID.properties
@@ -0,0 +1,7 @@
+login_CodeError=Galat konfigurasi kode verifikasi\!
+login_CodeNull=Kode verifikasi tidak ada atau sudah habis  
+login_account=Akaun tidak diaktifkan  
+login_childError=Atasan tidak bisa bertindak untuk diri mereka sendiri  
+login_pwd=Akaun atau kata sandi yang salah  
+login_pwd_1=Modifikasi gagal, kesalahan kata sandi lama  
+login_pwd_2=Kata sandi baru tidak dapat sama dengan kata sandi lama  
--- a/lms/nladmin-ui/README.md
+++ b/lms/nladmin-ui/README.md
@@ -1,2 +1,3 @@
 # 兰州二期LMS前端

+/api/sysMenu/build?systemType=1