diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java
index d9b7cb6..e6c9720 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLabelTemplateService.java
@@ -34,6 +34,13 @@ public interface ISysLabelTemplateService {
     void deleteSysLabelTemplateById(Long id);
 
     /**
+     * 软删除打印模板
+     * @param id
+     */
+    @ApiOperation(value = "软删除打印模板")
+    void deleteWeaklySysLabelTemplateById(Long id,String userName);
+
+    /**
      * 修改打印模板
      * @param sysLabelTemplate
      */
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
index 64ffaa1..5676cd8 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java
@@ -1,248 +1,248 @@
-package cn.estsh.i3plus.core.apiservice.controller;
-
-import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
-import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
-import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysRole;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
-import cn.estsh.impp.framework.boot.util.ResultBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.session.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Enumeration;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/impp")
-@Api(description="分布式服务测试")
-public class DemoCloudController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
-
-    @Value("${server.port}")
-    private String serverPort;
-
-    @Value("${eureka.instance.ip-address}")
-    private String ipAddress;
-
-    @Autowired
-    ICoreDemoCloud iCoreDemoCloud;
-
-    @Autowired
-    IWmsDemoCloud iWmsDemoCloud;
-
-    /**
-     * core测试
-     * @param test 测试文本
-     * @return 处理结果
-     */
-    @GetMapping(value="/cloud/test")
-    @ApiOperation(value="core测试",notes = "core测试")
-    public BaseResultBean testCore(String test) {
-        LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test);
-        //return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        return BaseResultBean.buildBaseResultBean(true,"");
-    }
-
-    /**
-     * wms测试
-     * @param test 测试文本
-     * @return 处理结果
-     */
-    @GetMapping(value="/cloud/test-wms")
-    @ApiOperation(value="wms测试",notes = "wms测试")
-    public ResultBean testWms(String test) {
-        LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test);
-
-        BaseResultBean result = iWmsDemoCloud.testWms(test);
-        if(result.isSuccess()){
-            return ResultBean.success("wms返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-        }else{
-            LOGGER.error("无法调用wms服务：{}",result.getErrorMsg());
-            return ResultBean.fail("调用wms服务出错：" + result.getErrorMsg());
-        }
-    }
-
-    /**
-     * 测试get
-     * @param test 测试文本
-     * @return 处理结果
-     */
-    @GetMapping(value="/cloud/test-get")
-    @ApiOperation(value="测试get",notes = "测试get")
-    public ResultBean testFeignGet(String test) {
-        LOGGER.info("【impp-core-get接受数据】{}" ,test);
-        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * 测试post
-     * @param test 测试文本
-     * @return 处理结果
-     */
-    @PostMapping(value="/test-post")
-    @ApiOperation(value="测试post",notes = "测试post")
-    public ResultBean testFeignPost(String test) {
-        LOGGER.info("【impp-core-post接受数据】{}" ,test);
-        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * put接受数据
-     * @param test 测试文本
-     * @param name 测试文本
-     * @return
-     */
-    @PutMapping(value="/cloud/test-put")
-    @ApiOperation(value="put接受数据",notes = "put接受数据")
-    public ResultBean testPut(String test,String name) {
-        LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name);
-        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * delete接受数据
-     * @param pager 参数
-     * @param test 测试文本
-     * @return 处理结果
-     */
-    @DeleteMapping(value="/cloud/test-delete")
-    @ApiOperation(value="delete接受数据",notes = "delete接受数据")
-    public ResultBean testDelete(
-            @RequestBody Pager pager,
-            @RequestParam("test") String test) {
-        LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test);
-        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * 测试cloudput
-     * @param test 测试文本
-     * @param name 测试文本
-     * @return 处理结果
-     */
-    @PutMapping(value="/cloud/test-cloud-put")
-    @ApiOperation(value="测试cloudput",notes = "测试cloudput")
-    public ResultBean putTestCloud(String test,String name) {
-        LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name);
-        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * 测试单对象
-     * @param pager 对象参数
-     * @return 处理结果
-     */
-    @PostMapping(value="/cloud/test-object")
-    @ApiOperation(value="测试单对象")
-    public ResultBean testObject(@RequestBody Pager pager) {
-        LOGGER.info("【impp-core-object接受数据】{}" ,pager);
-        return ResultBean.success("返回：" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * 测试get
-     * @param map map参数
-     * @return 处理结果
-     */
-    @PostMapping(value="/cloud/test-map")
-    @ApiOperation(value="测试get",notes = "测试get")
-    public ResultBean testFeignMap(@RequestBody Map<String,String> map) {
-        LOGGER.info("【impp-core-map接受数据】{}" ,map);
-        return ResultBean.success("返回：" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    /**
-     * 测试arr
-     * @param arr 文本数组
-     * @return 处理结果
-     */
-    @PostMapping(value="/cloud/test-arr")
-    @ApiOperation(value="测试arr",notes = "测试arr")
-    public ResultBean testFeignArr(@RequestBody String[] arr) {
-        LOGGER.info("【impp-core-arr接受数据】{}" ,arr);
-        return ResultBean.success("返回成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(arr);
-    }
-
-    /**
-     * 测试多对象模型
-     * @param roleBean 初始
-     * @return
-     */
-    @PostMapping(value="/cloud/test-more-object")
-    @ApiOperation(value="测试多对象模型",notes = "测试多对象模型")
-    public ResultBean testFeignMoreObj(@RequestBody BaseModelBean<SysRole> roleBean) {
-        LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
-        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    @Autowired
-    public HttpServletRequest request;
-
-    @PostMapping(value="/cloud/test-post-request-body")
-    @ApiOperation(value="测试request-body")
-    public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) {
-        LOGGER.info("PostMapping【param】{}" ,test);
-
-        Enumeration headerNames = request.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = request.getHeader(key);
-            System.out.println("key:"+key + "  ,value: " + value);
-        }
-
-        LOGGER.info("【测试request-body-post】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
-        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    @GetMapping(value="/cloud/test-get-request-body")
-    @ApiOperation(value="测试request-body")
-    public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean<SysRole> roleBean) {
-        Enumeration headerNames = request.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = request.getHeader(key);
-            System.out.println("key:"+key + "  ,value: " + value);
-        }
-
-        LOGGER.info("【测试request-body-get】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
-        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    @GetMapping(value="/operate/testwmsauth")
-    public BaseResultBean testwmsauth(){
-        LOGGER.info("【测试testwmsauth】" );
-        Session session = AuthUtil.getSession();
-        LOGGER.info("session:{}",session);
-
-        SessionUser sessionUser = (SessionUser) session.getAttribute(CommonConstWords.SESSION_USER);
-        LOGGER.info("登陆信息:{}",sessionUser);
-        iWmsDemoCloud.testauth();
-
-        return ResultBean.success("平台授权").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-
-    @GetMapping(value="/operate/testauth")
-    public BaseResultBean testauth(){
-        LOGGER.info("【测试testauth】" );
-        Session session = AuthUtil.getSession();
-        LOGGER.info("session:{}",session);
-
-        SessionUser sessionUser = (SessionUser) session.getAttribute(CommonConstWords.SESSION_USER);
-        LOGGER.info("登陆信息:{}",sessionUser);
-
-        return ResultBean.success("平台授权").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
-    }
-}
+//package cn.estsh.i3plus.core.apiservice.controller;
+//
+//import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
+//import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud;
+//import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+//import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
+//import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
+//import cn.estsh.i3plus.pojo.base.common.Pager;
+//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+//import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+//import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+//import cn.estsh.impp.framework.boot.auth.AuthUtil;
+//import cn.estsh.impp.framework.boot.util.ResultBean;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.apache.shiro.session.Session;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import java.util.Enumeration;
+//import java.util.Map;
+//
+//@RestController
+//@RequestMapping("/impp")
+//@Api(description="分布式服务测试")
+//public class DemoCloudController {
+//
+//    private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
+//
+//    @Value("${server.port}")
+//    private String serverPort;
+//
+//    @Value("${eureka.instance.ip-address}")
+//    private String ipAddress;
+//
+//    @Autowired
+//    ICoreDemoCloud iCoreDemoCloud;
+//
+//    @Autowired
+//    IWmsDemoCloud iWmsDemoCloud;
+//
+//    /**
+//     * core测试
+//     * @param test 测试文本
+//     * @return 处理结果
+//     */
+//    @GetMapping(value="/cloud/test")
+//    @ApiOperation(value="core测试",notes = "core测试")
+//    public BaseResultBean testCore(String test) {
+//        LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test);
+//        //return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//        return BaseResultBean.buildBaseResultBean(true,"");
+//    }
+//
+//    /**
+//     * wms测试
+//     * @param test 测试文本
+//     * @return 处理结果
+//     */
+//    @GetMapping(value="/cloud/test-wms")
+//    @ApiOperation(value="wms测试",notes = "wms测试")
+//    public ResultBean testWms(String test) {
+//        LOGGER.info("iWmsDemoCloud:{},ip:{},port:{}，【impp-core接受数据】{}",iWmsDemoCloud,ipAddress,serverPort,test);
+//
+//        BaseResultBean result = iWmsDemoCloud.testWms(test);
+//        if(result.isSuccess()){
+//            return ResultBean.success("wms返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//        }else{
+//            LOGGER.error("无法调用wms服务：{}",result.getErrorMsg());
+//            return ResultBean.fail("调用wms服务出错：" + result.getErrorMsg());
+//        }
+//    }
+//
+//    /**
+//     * 测试get
+//     * @param test 测试文本
+//     * @return 处理结果
+//     */
+//    @GetMapping(value="/cloud/test-get")
+//    @ApiOperation(value="测试get",notes = "测试get")
+//    public ResultBean testFeignGet(String test) {
+//        LOGGER.info("【impp-core-get接受数据】{}" ,test);
+//        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * 测试post
+//     * @param test 测试文本
+//     * @return 处理结果
+//     */
+//    @PostMapping(value="/test-post")
+//    @ApiOperation(value="测试post",notes = "测试post")
+//    public ResultBean testFeignPost(String test) {
+//        LOGGER.info("【impp-core-post接受数据】{}" ,test);
+//        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * put接受数据
+//     * @param test 测试文本
+//     * @param name 测试文本
+//     * @return
+//     */
+//    @PutMapping(value="/cloud/test-put")
+//    @ApiOperation(value="put接受数据",notes = "put接受数据")
+//    public ResultBean testPut(String test,String name) {
+//        LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name);
+//        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * delete接受数据
+//     * @param pager 参数
+//     * @param test 测试文本
+//     * @return 处理结果
+//     */
+//    @DeleteMapping(value="/cloud/test-delete")
+//    @ApiOperation(value="delete接受数据",notes = "delete接受数据")
+//    public ResultBean testDelete(
+//            @RequestBody Pager pager,
+//            @RequestParam("test") String test) {
+//        LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test);
+//        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * 测试cloudput
+//     * @param test 测试文本
+//     * @param name 测试文本
+//     * @return 处理结果
+//     */
+//    @PutMapping(value="/cloud/test-cloud-put")
+//    @ApiOperation(value="测试cloudput",notes = "测试cloudput")
+//    public ResultBean putTestCloud(String test,String name) {
+//        LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name);
+//        return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * 测试单对象
+//     * @param pager 对象参数
+//     * @return 处理结果
+//     */
+//    @PostMapping(value="/cloud/test-object")
+//    @ApiOperation(value="测试单对象")
+//    public ResultBean testObject(@RequestBody Pager pager) {
+//        LOGGER.info("【impp-core-object接受数据】{}" ,pager);
+//        return ResultBean.success("返回：" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * 测试get
+//     * @param map map参数
+//     * @return 处理结果
+//     */
+//    @PostMapping(value="/cloud/test-map")
+//    @ApiOperation(value="测试get",notes = "测试get")
+//    public ResultBean testFeignMap(@RequestBody Map<String,String> map) {
+//        LOGGER.info("【impp-core-map接受数据】{}" ,map);
+//        return ResultBean.success("返回：" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    /**
+//     * 测试arr
+//     * @param arr 文本数组
+//     * @return 处理结果
+//     */
+//    @PostMapping(value="/cloud/test-arr")
+//    @ApiOperation(value="测试arr",notes = "测试arr")
+//    public ResultBean testFeignArr(@RequestBody String[] arr) {
+//        LOGGER.info("【impp-core-arr接受数据】{}" ,arr);
+//        return ResultBean.success("返回成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(arr);
+//    }
+//
+//    /**
+//     * 测试多对象模型
+//     * @param roleBean 初始
+//     * @return
+//     */
+//    @PostMapping(value="/cloud/test-more-object")
+//    @ApiOperation(value="测试多对象模型",notes = "测试多对象模型")
+//    public ResultBean testFeignMoreObj(@RequestBody BaseModelBean<SysRole> roleBean) {
+//        LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+//        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    @Autowired
+//    public HttpServletRequest request;
+//
+//    @PostMapping(value="/cloud/test-post-request-body")
+//    @ApiOperation(value="测试request-body")
+//    public ResultBean testPostFeignRequestBody(@RequestParam("test") String test,@RequestBody BaseModelBean<SysRole> roleBean) {
+//        LOGGER.info("PostMapping【param】{}" ,test);
+//
+//        Enumeration headerNames = request.getHeaderNames();
+//        while (headerNames.hasMoreElements()) {
+//            String key = (String) headerNames.nextElement();
+//            String value = request.getHeader(key);
+//            System.out.println("key:"+key + "  ,value: " + value);
+//        }
+//
+//        LOGGER.info("【测试request-body-post】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+//        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    @GetMapping(value="/cloud/test-get-request-body")
+//    @ApiOperation(value="测试request-body")
+//    public ResultBean testGetFeignRequestBody(@RequestBody BaseModelBean<SysRole> roleBean) {
+//        Enumeration headerNames = request.getHeaderNames();
+//        while (headerNames.hasMoreElements()) {
+//            String key = (String) headerNames.nextElement();
+//            String value = request.getHeader(key);
+//            System.out.println("key:"+key + "  ,value: " + value);
+//        }
+//
+//        LOGGER.info("【测试request-body-get】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+//        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    @GetMapping(value="/operate/testwmsauth")
+//    public BaseResultBean testwmsauth(){
+//        LOGGER.info("【测试testwmsauth】" );
+//        Session session = AuthUtil.getSession();
+//        LOGGER.info("session:{}",session);
+//
+//        SessionUser sessionUser = (SessionUser) session.getAttribute(CommonConstWords.SESSION_USER);
+//        LOGGER.info("登陆信息:{}",sessionUser);
+//        iWmsDemoCloud.testauth();
+//
+//        return ResultBean.success("平台授权").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//
+//    @GetMapping(value="/operate/testauth")
+//    public BaseResultBean testauth(){
+//        LOGGER.info("【测试testauth】" );
+//        Session session = AuthUtil.getSession();
+//        LOGGER.info("session:{}",session);
+//
+//        SessionUser sessionUser = (SessionUser) session.getAttribute(CommonConstWords.SESSION_USER);
+//        LOGGER.info("登陆信息:{}",sessionUser);
+//
+//        return ResultBean.success("平台授权").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+//    }
+//}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index 18d413c..7bf5777 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
@@ -245,10 +245,11 @@ public class WhiteController extends CoreBaseController {
             }
 
             // 从缓存获取语言信息
-            Map<Object, Object> resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + languageCode);
+            Map<Object, Object> resourceMap =
+                    redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB+ ":" + languageCode);
             if (resourceMap == null || resourceMap.size() == 0) {
                 systemInitService.putAndLoadSysLocaleLanguage();
-                resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + languageCode);
+                resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode);
             }
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap);
@@ -277,6 +278,39 @@ public class WhiteController extends CoreBaseController {
 
 
 
+    @GetMapping(value = "/white/find-language-code-soft-type")
+    @ApiOperation(value = "根据语言代码查询资源")
+    public ResultBean findSysLocaleResourceByLanguageCode(String languageCode,Integer softType){
+        try {
+            startMultiService();
+
+            ValidatorBean.checkNotNull(languageCode,"语言代码不能为空");
+            ValidatorBean.checkNotNull(softType,"软件类型不能为空");
+            if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("语言不存在")
+                        .build();
+            }
+
+            // 从缓存获取语言信息
+            Map<Object, Object> resourceMap =
+                    redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + softType);
+            if (resourceMap == null || resourceMap.size() == 0) {
+                systemInitService.putAndLoadSysLocaleLanguage();
+                resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + softType);
+            }
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
     @PostMapping(value = "/sys-file/insert")
     @ApiOperation(value = "新增文件资源", notes = "新增文件资源")
     public ResultBean insertSysFile(@RequestBody SysFile sysFile){
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
index ac8a80d..27436fe 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
@@ -22,16 +22,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
@@ -103,7 +96,7 @@ public class SysLabelTemplateController extends CoreBaseController {
                         .build();
             }
 
-            sysLabelTemplateService.deleteSysLabelTemplateById(Long.parseLong(idStr));
+            sysLabelTemplateService.deleteWeaklySysLabelTemplateById(Long.parseLong(idStr),AuthUtil.getSessionUser().getUserName());
             return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
index c121003..fa269a2 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
@@ -127,6 +127,9 @@ public class SystemInitService implements ISystemInitService {
             HashMap<String,String> lanMap = null;
             HashMap<String,HashMap<String,String>> webLangMap = new HashMap<>();
             HashMap<String,String> webResMap;
+            HashMap<String,HashMap<String,String>> webSoftLangMap = new HashMap<>();
+            HashMap<String,String> webSoftResMap;
+            String softResKey=null;
 
             //语言数量
             List<SysLocaleLanguage> langList = systemResourceService.listSysLocaleLanguage(null);
@@ -153,6 +156,15 @@ public class SystemInitService implements ISystemInitService {
                 // 放入资源信息
                 webResMap = webLangMap.get(res.getLanguageCode());
                 webResMap.put(res.getResourceKey(), res.getResourceValue());
+
+                // web 模块资源
+                softResKey = res.getLanguageCode() + ":" + res.getSoftTypeVal();
+                if(!webSoftLangMap.containsKey(softResKey)){
+                    webSoftLangMap.put(softResKey, new HashMap<>());
+                }
+                // 放入模块资源信息
+                webSoftResMap = webSoftLangMap.get(softResKey);
+                webSoftResMap.put(res.getResourceKey(), res.getResourceValue());
             }
 
             for (String key : resMap.keySet()) {
@@ -165,7 +177,14 @@ public class SystemInitService implements ISystemInitService {
             for(String key : webLangMap.keySet()){
                 //放入缓存
                 if(webLangMap.get(key) != null){
-                    redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key,webLangMap.get(key),0);
+                    redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + key,webLangMap.get(key),0);
+                }
+            }
+
+            for(String key : webSoftLangMap.keySet()){
+                //放入缓存
+                if(webSoftLangMap.get(key) != null){
+                    redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + key,webSoftLangMap.get(key),0);
                 }
             }
 
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
index 0db1135..fca4fd2 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java
@@ -93,6 +93,13 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
     }
 
     @Override
+    @ApiOperation(value = "软删除打印模板")
+    public void deleteWeaklySysLabelTemplateById(Long id,String userName) {
+        sysLabelTemplateRDao.deleteWeaklyById(id,userName);
+        sysLabelTemplateParamRDao.deleteWeaklyByProperty("templateId", id,userName);
+    }
+
+    @Override
     @ApiOperation(value = "修改打印模板", notes = "修改打印模板")
     public void updateSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
         SysLabelTemplate updateBefore = sysLabelTemplateRDao.getById(sysLabelTemplate.getId());