Merge remote-tracking branch 'origin/master'

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/CacheController.java

@@ -44,7 +44,7 @@ public class CacheController
         caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping()
     public AjaxResult getInfo() throws Exception
     {
@@ -68,14 +68,14 @@ public class CacheController
         return AjaxResult.success(result);
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping("/getNames")
     public AjaxResult cache()
     {
         return AjaxResult.success(caches);
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping("/getKeys/{cacheName}")
     public AjaxResult getCacheKeys(@PathVariable String cacheName)
     {
@@ -83,7 +83,7 @@ public class CacheController
         return AjaxResult.success(cacheKeys);
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @GetMapping("/getValue/{cacheName}/{cacheKey}")
     public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
     {
@@ -92,7 +92,7 @@ public class CacheController
         return AjaxResult.success(sysCache);
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:cache:list')")
     @DeleteMapping("/clearCacheName/{cacheName}")
     public AjaxResult clearCacheName(@PathVariable String cacheName)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/ServerController.java

@@ -16,7 +16,7 @@ import com.zkqy.framework.web.domain.Server;
 @RequestMapping("/monitor/server")
 public class ServerController
 {
-    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:server:list')")
     @GetMapping()
     public AjaxResult getInfo() throws Exception
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysLogininforController.java

@@ -35,7 +35,7 @@ public class SysLogininforController extends BaseController
     @Autowired
     private SysPasswordService passwordService;
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysLogininfor logininfor)
     {
@@ -45,7 +45,7 @@ public class SysLogininforController extends BaseController
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+    //@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysLogininfor logininfor)
     {
@@ -54,7 +54,7 @@ public class SysLogininforController extends BaseController
         util.exportExcel(response, list, "登录日志");
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
     public AjaxResult remove(@PathVariable Long[] infoIds)
@@ -62,7 +62,7 @@ public class SysLogininforController extends BaseController
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()
@@ -71,7 +71,7 @@ public class SysLogininforController extends BaseController
         return success();
     }
 
-    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+    //@PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
     @Log(title = "账户解锁", businessType = BusinessType.OTHER)
     @GetMapping("/unlock/{userName}")
     public AjaxResult unlock(@PathVariable("userName") String userName)

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysOperlogController.java

@@ -33,7 +33,7 @@ public class SysOperlogController extends BaseController
     @Autowired
     private ISysOperLogService operLogService;
 
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysOperLog operLog)
     {
@@ -48,7 +48,7 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+    //@PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysOperLog operLog)
     {
@@ -63,7 +63,7 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/{operIds}")
     public AjaxResult remove(@PathVariable Long[] operIds)
     {
@@ -71,7 +71,7 @@ public class SysOperlogController extends BaseController
     }
 
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
-    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+    //@PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
     @DeleteMapping("/clean")
     public AjaxResult clean()
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysUserOnlineController.java

@@ -38,7 +38,7 @@ public class SysUserOnlineController extends BaseController
     @Autowired
     private RedisCache redisCache;
 
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+    //@PreAuthorize("@ss.hasPermi('monitor:online:list')")
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysBpmNodeScriptController.java

@@ -39,7 +39,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 查询流程节点脚本列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:list')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询流程节点脚本列表")
     public TableDataInfo list(SysBpmNodeScript sysBpmNodeScript)
@@ -52,7 +52,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 导出流程节点脚本列表
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:export')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:export')")
     @Log(title = "流程节点脚本", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "导出流程节点脚本列表")
@@ -66,7 +66,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 获取流程节点脚本详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:query')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:query')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取流程节点脚本详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -77,7 +77,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 新增流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:add')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:add')")
     @Log(title = "流程节点脚本", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation(value = "新增流程节点脚本")
@@ -89,7 +89,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 修改流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:edit')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:edit')")
     @Log(title = "流程节点脚本", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "修改流程节点脚本")
@@ -101,7 +101,7 @@ public class SysBpmNodeScriptController extends BaseController
     /**
      * 删除流程节点脚本
      */
-//    @PreAuthorize("@ss.hasPermi('system:script:remove')")
+//    //@PreAuthorize("@ss.hasPermi('system:script:remove')")
     @Log(title = "流程节点脚本", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation(value = "删除流程节点脚本")

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysConfigController.java

@@ -37,7 +37,7 @@ public class SysConfigController extends BaseController
     /**
      * 获取参数配置列表
      */
-    @PreAuthorize("@ss.hasPermi('system:config:list')")
+    //@PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysConfig config)
     {
@@ -47,7 +47,7 @@ public class SysConfigController extends BaseController
     }
 
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:config:export')")
+    //@PreAuthorize("@ss.hasPermi('system:config:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysConfig config)
     {
@@ -59,7 +59,7 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    //@PreAuthorize("@ss.hasPermi('system:config:query')")
     @GetMapping(value = "/{configId}")
     public AjaxResult getInfo(@PathVariable Long configId)
     {
@@ -78,7 +78,7 @@ public class SysConfigController extends BaseController
     /**
      * 新增参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    //@PreAuthorize("@ss.hasPermi('system:config:add')")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysConfig config)
@@ -94,7 +94,7 @@ public class SysConfigController extends BaseController
     /**
      * 修改参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
@@ -110,7 +110,7 @@ public class SysConfigController extends BaseController
     /**
      * 删除参数配置
      */
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
@@ -122,7 +122,7 @@ public class SysConfigController extends BaseController
     /**
      * 刷新参数缓存
      */
-    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public AjaxResult refreshCache()

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDeptController.java

@@ -37,7 +37,7 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {
@@ -51,7 +51,7 @@ public class SysDeptController extends BaseController
     /**
      * 查询部门列表（排除节点）
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
@@ -63,7 +63,7 @@ public class SysDeptController extends BaseController
     /**
      * 根据部门编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
@@ -74,7 +74,7 @@ public class SysDeptController extends BaseController
     /**
      * 新增部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept)
@@ -90,7 +90,7 @@ public class SysDeptController extends BaseController
     /**
      * 修改部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
@@ -116,7 +116,7 @@ public class SysDeptController extends BaseController
     /**
      * 删除部门
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java

@@ -41,7 +41,7 @@ public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    //    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    //    //@PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData) {
         startPage();
@@ -50,7 +50,7 @@ public class SysDictDataController extends BaseController {
     }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
@@ -61,7 +61,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode) {
         return success(dictDataService.selectDictDataById(dictCode));
@@ -72,7 +72,7 @@ public class SysDictDataController extends BaseController {
      * 根据dict_label查询字典数据详细
      * 根据编码查询--对应后的转码信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/getDictLabel/{dictLabel}")
     public AjaxResult getInfoByDictLabel(@PathVariable String dictLabel) {
         return success(dictDataService.selectDictDataByDictLabel(dictLabel));
@@ -94,7 +94,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictData dict) {
@@ -105,7 +105,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 修改保存字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
@@ -116,7 +116,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes) {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictTypeController.java

@@ -34,7 +34,7 @@ public class SysDictTypeController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictType dictType)
     {
@@ -44,7 +44,7 @@ public class SysDictTypeController extends BaseController
     }
 
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictType dictType)
     {
@@ -56,7 +56,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 查询字典类型详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictId}")
     public AjaxResult getInfo(@PathVariable Long dictId)
     {
@@ -66,7 +66,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 新增字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
@@ -82,7 +82,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 修改字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
@@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 删除字典类型
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
@@ -110,7 +110,7 @@ public class SysDictTypeController extends BaseController
     /**
      * 刷新字典缓存
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     public AjaxResult refreshCache()

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java

@@ -29,7 +29,7 @@ public class SysMenuController extends BaseController {
     /**
      * 获取菜单列表
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu) {
         List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
@@ -39,7 +39,7 @@ public class SysMenuController extends BaseController {
     /**
      * 根据菜单编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:query')")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId) {
         return success(menuService.selectMenuById(menuId));
@@ -69,7 +69,7 @@ public class SysMenuController extends BaseController {
     /**
      * 新增菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:add')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysMenu menu) {
@@ -90,7 +90,7 @@ public class SysMenuController extends BaseController {
     /**
      * 修改菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
@@ -108,7 +108,7 @@ public class SysMenuController extends BaseController {
     /**
      * 删除菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId) {
@@ -124,7 +124,7 @@ public class SysMenuController extends BaseController {
     /**
      * 批量删除菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeBatch/{menuIds}")
     public AjaxResult removeBatch(@PathVariable List<Long> menuIds) {
@@ -141,7 +141,7 @@ public class SysMenuController extends BaseController {
     /**
      * 动态表格获取菜单
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    //@PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/getMenuList")
     public AjaxResult getMenuList() {
         List<SysMenu> menus = menuService.getMenuList(getTenantId());

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysNoticeController.java

@@ -35,7 +35,7 @@ public class SysNoticeController extends BaseController
     /**
      * 获取通知公告列表
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+    //@PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysNotice notice)
     {
@@ -47,7 +47,7 @@ public class SysNoticeController extends BaseController
     /**
      * 根据通知公告编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+    //@PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
     public AjaxResult getInfo(@PathVariable Long noticeId)
     {
@@ -57,7 +57,7 @@ public class SysNoticeController extends BaseController
     /**
      * 新增通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+    //@PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysNotice notice)
@@ -69,7 +69,7 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
@@ -81,7 +81,7 @@ public class SysNoticeController extends BaseController
     /**
      * 删除通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds)

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysPostController.java

@@ -37,7 +37,7 @@ public class SysPostController extends BaseController
     /**
      * 获取岗位列表
      */
-    @PreAuthorize("@ss.hasPermi('system:post:list')")
+    //@PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysPost post)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java

@@ -55,7 +55,7 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    //@PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {
@@ -68,7 +68,7 @@ public class SysRoleController extends BaseController
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:role:export')")
+    //@PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role)
     {
@@ -81,7 +81,7 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId)
     {
@@ -92,7 +92,7 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:add')")
+    //@PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -114,7 +114,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -149,7 +149,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
@@ -162,7 +162,7 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
@@ -176,7 +176,7 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
-    @PreAuthorize("@ss.hasPermi('system:role:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds)
@@ -187,7 +187,7 @@ public class SysRoleController extends BaseController
     /**
      * 获取角色选择框列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {
@@ -197,7 +197,7 @@ public class SysRoleController extends BaseController
     /**
      * 查询已分配用户角色列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    //@PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo allocatedList(SysUser user)
     {
@@ -209,7 +209,7 @@ public class SysRoleController extends BaseController
     /**
      * 查询未分配用户角色列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:list')")
+    //@PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo unallocatedList(SysUser user)
     {
@@ -221,7 +221,7 @@ public class SysRoleController extends BaseController
     /**
      * 取消授权用户
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
@@ -232,7 +232,7 @@ public class SysRoleController extends BaseController
     /**
      * 批量取消授权用户
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -243,7 +243,7 @@ public class SysRoleController extends BaseController
     /**
      * 批量选择用户授权
      */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
@@ -255,7 +255,7 @@ public class SysRoleController extends BaseController
     /**
      * 获取对应角色部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:role:query')")
+    //@PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/deptTree/{roleId}")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysTenantController.java

@@ -38,7 +38,7 @@ public class SysTenantController extends BaseController {
     /**
      * 查询租户信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysTenant sysTenant) {
         startPage();
@@ -49,7 +49,7 @@ public class SysTenantController extends BaseController {
     /**
      * 查询所有租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/getTenantAllList")
     public TableDataInfo getTenantAllList(SysTenant sysTenant) {
         List<SysTenant> list = sysTenantService.selectSysTenantAllList(sysTenant);
@@ -59,7 +59,7 @@ public class SysTenantController extends BaseController {
     /**
      * 导出租户信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:export')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:export')")
     @Log(title = "租户信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysTenant sysTenant) {
@@ -71,7 +71,7 @@ public class SysTenantController extends BaseController {
     /**
      * 获取租户信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:query')")
     @GetMapping(value = "/{tenantId}")
     public AjaxResult getInfo(@PathVariable("tenantId") Long tenantId) {
         return success(sysTenantService.selectSysTenantByTenantId(tenantId));
@@ -83,7 +83,7 @@ public class SysTenantController extends BaseController {
      * @param tenantId
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:query')")
     @GetMapping(value = "/getTenantChildrenInfo/{tenantId}")
     public AjaxResult getTenantChildrenInfo(@PathVariable("tenantId") Long tenantId) {
         return success(sysTenantService.selectSysTenantChildrenInfoByTenantId(tenantId));
@@ -92,7 +92,7 @@ public class SysTenantController extends BaseController {
     /**
      * 新增租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:add')")
     @Log(title = "租户信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysTenant sysTenant) {
@@ -102,7 +102,7 @@ public class SysTenantController extends BaseController {
     /**
      * 修改租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:edit')")
     @Log(title = "租户信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysTenant sysTenant) {
@@ -112,7 +112,7 @@ public class SysTenantController extends BaseController {
     /**
      * 删除租户信息
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:tenant:remove')")
     @Log(title = "租户信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tenantIds}")
     public AjaxResult remove(@PathVariable Long[] tenantIds) {

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java

@@ -59,7 +59,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取用户列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    //@PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
         startPage();
@@ -71,7 +71,7 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:export')")
+    //@PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user, List<String> uIds) {
         if (uIds != null && uIds.size() != 0) {
@@ -84,7 +84,7 @@ public class SysUserController extends BaseController {
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:user:import')")
+    //@PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
@@ -103,7 +103,7 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{userId}"})
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
@@ -135,7 +135,7 @@ public class SysUserController extends BaseController {
     /**
      * 新增用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    //@PreAuthorize("@ss.hasPermi('system:user:add')")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -158,7 +158,7 @@ public class SysUserController extends BaseController {
     /**
      * 修改用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -178,7 +178,7 @@ public class SysUserController extends BaseController {
     /**
      * 删除用户
      */
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
+    //@PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds) {
@@ -191,7 +191,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
-    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+    //@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
@@ -205,7 +205,7 @@ public class SysUserController extends BaseController {
     /**
      * 状态修改
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
@@ -218,7 +218,7 @@ public class SysUserController extends BaseController {
     /**
      * 根据用户编号获取授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    //@PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
@@ -249,7 +249,7 @@ public class SysUserController extends BaseController {
     /**
      * 用户授权角色
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
@@ -261,7 +261,7 @@ public class SysUserController extends BaseController {
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    //@PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept) {
         if (getLoginUser().isTenantAdmin()) {

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInventoryServiceImpl.java

@@ -209,7 +209,7 @@ public class ProductInventoryServiceImpl implements IProductInventoryService
             productOutboundRecordMapper.insertProductOutboundRecord(productOutboundRecord);
             //出库   减 箱数、筒数、净重、毛重,
             //得到当前库存
-            ProductInventory productInventory = productInventoryMapper.selectProductInventoryByQrCode(vo.getQrCode());
+            ProductInventory productInventory = productInventoryMapper.selectProductInventoryByQrCode(productCodeList.getQrCode());
             ProductInventory editProductInventory = new ProductInventory();
             editProductInventory.setId(productInventory.getId());
             //筒数

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionPickingUp.java

@@ -0,0 +1,89 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.chemicalfiber;
+
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.ICommonService;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 加弹-拣货-正常节点
+ */
+@Service("e91cb522-247d-44ef-840b-30524a7f0ddc")
+@Scope("prototype")
+public class AddAmmunitionPickingUp implements IRunBPMService {
+
+    @Autowired
+    private ICommonService commonService;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+
+        //销售单货品详情
+        CommonEntity saleProductsParam = new CommonEntity();
+        saleProductsParam.getBasicMap().put("tableName","sale_products");
+        saleProductsParam.getConditionMap().put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        saleProductsParam.getConditionMap().put("del_flag","0");
+        CommonEntity saleProducts = commonService.getInfoById(saleProductsParam);
+
+        //根据货品编号查询货品信息
+        CommonEntity productParam = new CommonEntity();
+        productParam.getBasicMap().put("tableName","production");
+        productParam.getConditionMap().put("product_no",saleProducts.getResultMap().get("product_no"));
+        productParam.getConditionMap().put("del_flag","0");
+        CommonEntity products = commonService.getInfoById(productParam);
+
+
+        //根据销单货品编号查询拣货信息
+        CommonEntity productAddAmmunitionParam = new CommonEntity();
+        productAddAmmunitionParam.getBasicMap().put("tableName","sale_product_add_ammunition");
+        productAddAmmunitionParam.getConditionMap().put("sale_product_id",bpmRunNodeFromVo.getTaskPlanKey());
+        productAddAmmunitionParam.getConditionMap().put("del_flag","0");
+        productAddAmmunitionParam.getConditionMap().put("add_ammunition_type","1");
+        CommonEntity productAddAmmunition = commonService.getInfoById(productAddAmmunitionParam);
+
+        CommonEntity result = new CommonEntity();
+        result.getResultMap().put("saleProducts",saleProducts);
+        result.getResultMap().put("products",products);
+        result.getResultMap().put("productAddAmmunition",productAddAmmunition);
+
+
+
+
+        return result;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionWireOn.java

@@ -0,0 +1,82 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.chemicalfiber;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.ICommonService;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 加弹-上丝-正常节点
+ */
+@Service("13279a88-be25-4af8-ac6a-508a006e29b8")
+@Scope("prototype")
+public class AddAmmunitionWireOn implements IRunBPMService {
+
+    @Autowired
+    private ICommonService commonService;
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+
+        //销售单货品详情
+        CommonEntity saleProductsParam = new CommonEntity();
+        saleProductsParam.getBasicMap().put("tableName","sale_products");
+        saleProductsParam.getConditionMap().put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        saleProductsParam.getConditionMap().put("del_flag","0");
+        CommonEntity saleProducts = commonService.getInfoById(saleProductsParam);
+
+        //根据货品编号查询货品信息
+        CommonEntity productParam = new CommonEntity();
+        productParam.getBasicMap().put("tableName","production");
+        productParam.getConditionMap().put("product_no",saleProducts.getResultMap().get("product_no"));
+        productParam.getConditionMap().put("del_flag","0");
+        CommonEntity products = commonService.getInfoById(productParam);
+
+        //根据销单货品编号查询拣货信息
+        CommonEntity productAddAmmunitionParam = new CommonEntity();
+        productAddAmmunitionParam.getBasicMap().put("tableName","sale_product_add_ammunition");
+        productAddAmmunitionParam.getConditionMap().put("sale_product_id",bpmRunNodeFromVo.getTaskPlanKey());
+        productAddAmmunitionParam.getConditionMap().put("del_flag","0");
+        productAddAmmunitionParam.getConditionMap().put("add_ammunition_type","2");
+        CommonEntity productAddAmmunition = commonService.getInfoById(productAddAmmunitionParam);
+
+        CommonEntity result = new CommonEntity();
+        result.getResultMap().put("saleProducts",saleProducts);
+        result.getResultMap().put("products",products);
+        result.getResultMap().put("productAddAmmunition",productAddAmmunition);
+        return result;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-ui/src/views/orderMange/codeListManage/index.vue

@@ -417,7 +417,7 @@
               </div>
               <div class="count-item">
                 <div class="count-title">
-                  <span>合计筒重:</span>
+                  <span>合计筒数:</span>
                 </div>
                 <div class="count-value">
                   <span>{{ count.sumCanisterNum }}</span>
@@ -987,6 +987,11 @@ export default {
               payLoad.id = rowData.id;
             }
             let tempApiFun = productCodeList;
+            if (this.excuteType == 3) {
+              //补码
+              this.printConfirmHandler(this.tableData[0].id);
+              return;
+            }
             let res = await tempApiFun(payLoad);
             let msg = this.isEdit ? "编辑" : "新增";
             if (res.code == 200) {
@@ -1115,7 +1120,7 @@ export default {
           } = this.currentRow;
           let directionOfTwistLabel = this.dict.type.direction_of_twist.find(
             (item) => item.value == directionOfTwist
-          ).label;
+          )?.label;
           let res = await getQrCode();
           let qrCode = "";
           if (res.code == 200) {
@@ -1383,6 +1388,7 @@ export default {
     initProductData() {
       this.batchNum = this.form.lotNum;
       this.batchNumChange();
+      console.log(this.batchTableData);
       if (this.batchTableData.length) {
         let {
           machineTool,
@@ -1406,11 +1412,15 @@ export default {
           directionOfTwist,
           productId,
         } = this.batchTableData[0];
+        let directionOfTwistLabel = this.dict.type.direction_of_twist.find(
+          (item) => item.value == directionOfTwist
+        )?.label;
         Object.assign(this.tableData[0], {
           productName, //品种
           productSpecifications, //规格
           productColor, //色号
           directionOfTwist, //捻向
+          directionOfTwistLabel,
         });
       }
     },

zkqy-ui/src/views/orderMange/outStock/index.vue

@@ -219,11 +219,16 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           let payLoad = { ...this.form };
+          console.log(this.form);
+          if (!this.form.id) {
+            return;
+          }
           delete payLoad.documentTypeName;
           let res = await noticeOutStorage(payLoad);
           if (res.code == 200) {
             this.$message.success("出库成功");
-            this.initData();
+            this.currentIndex = 0;
+            await this.initData();
             this.refreshHandler();
           } else {
             this.$message.error(res.msg);
@@ -289,6 +294,23 @@ export default {
     // 加载表单数据
     async initFormData() {
       let { id, customerName } = this.leftTableData[this.currentIndex];
+      console.log(this.leftTableData[this.currentIndex]);
+      if (!id) {
+        //重置表单数据
+        Object.assign(this.form, {
+          noticeNumber: "", //通知单号
+          documentType: "", //通知单类型
+          documentTypeName: "", //通知单类型  名
+          salesman: "", //销售员
+          sellingUnit: "", //售货单位
+          truckRegistration: "", //货车信息
+          dispatchNoteRemark: "", //备注
+          customerName: "", //客户名称
+          id: "",
+        });
+        console.log(this.form);
+        return;
+      }
       try {
         let res = await saleStorageDetails(id);
         console.log(res);