Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-admin/src/main/java/com/zkqy/web/controller/homepagestatistics/StatisticsController.java

@@ -1,16 +1,16 @@
 package com.zkqy.web.controller.homepagestatistics;
 
+import com.zkqy.business.domain.DetailsOfTheRefuelingPlan;
 import com.zkqy.business.entity.DragForm;
 import com.zkqy.business.entity.DragTable;
 import com.zkqy.business.entity.DragTableGroup;
 import com.zkqy.business.entity.vo.CommonTableOperationVO;
-import com.zkqy.business.service.impl.DragFormServiceImpl;
-import com.zkqy.business.service.impl.DragTableGroupServiceImpl;
-import com.zkqy.business.service.impl.DragTableServiceImpl;
-import com.zkqy.business.service.impl.MysqlTableOperationServiceImpl;
+import com.zkqy.business.service.impl.*;
 import com.zkqy.common.constant.DataSourceType;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.execution.produce.dispersed.entity.BpmExecuteProcess;
+import com.zkqy.execution.produce.dispersed.service.impl.BpmExecuteProcessServiceImpl;
 import com.zkqy.execution.produce.dispersed.service.impl.BpmProcessServiceImpl;
 import com.zkqy.system.domain.SysLogininfor;
 import com.zkqy.system.service.ISysOperLogService;
@@ -26,12 +26,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * 化纤数据统计
+ */
 @RestController
 @RequestMapping("/statistics/info")
 public class StatisticsController {
 
-     @Autowired
-     BpmProcessServiceImpl bpmProcessService;
+    @Autowired
+    BpmExecuteProcessServiceImpl bpmExecuteProcessService;
 
     @Autowired
     private ISysOperLogService operLogService;
@@ -40,29 +43,49 @@ public class StatisticsController {
     private SysLogininforServiceImpl logininforService;
 
     @Autowired
-    DragTableServiceImpl dragTableService;
+    DetailsOfTheRefuelingPlanServiceImpl detailsOfTheRefuelingPlanService;
+
+    @Autowired
+    DetailsOfTheRefuelingPlanSpinningServiceImpl detailsOfTheRefuelingPlanSpinningService;
 
     @Autowired
-    DragFormServiceImpl dragFormService;
+    MaterialInventoryServiceImpl   materialInventoryService;
 
     @Autowired
-    MysqlTableOperationServiceImpl mysqlTableOperationService;
+    InboundRecordsServiceImpl inboundRecordsService;
 
     @Autowired
-    DragTableGroupServiceImpl dragTableGroupService;
+    OutboundRecordsServiceImpl outboundRecordsService;
 
     /**
-     * 流程信息统计
+     * 任务数量统计 √
      * @return
      */
     @GetMapping("/getProcessInformation")
      public AjaxResult getProcessInformation(){
-          List<Map> bpmProcesses = bpmProcessService.selectBpmProcessStatistics();
-          return AjaxResult.success(bpmProcesses);
+        if(SecurityUtils.getUsername().equals("huaxian")){
+            //查询加弹计划
+            int i1 = detailsOfTheRefuelingPlanService.selectDetailsOfTheRefuelingPlanListCount();
+            int i2 = detailsOfTheRefuelingPlanSpinningService.selectDetailsOfTheRefuelingPlanSpinningListCount();
+            HashMap<String, String> map1 = new HashMap<>();
+            map1.put("name", "计划任务");
+            map1.put("value",String.valueOf((i1+i2)));
+            int i = bpmExecuteProcessService.selectBpmExecuteProcessListCount();
+            HashMap<String, String> map2 = new HashMap<>();
+            map2.put("审批任务",String.valueOf(i));
+            map2.put("name", "审批任务");
+            map2.put("value",String.valueOf(i));
+            List<Map> listMap=new ArrayList<>();
+            listMap.add(map1);
+            listMap.add(map2);
+            return AjaxResult.success(listMap);
+            //纺丝+翻框+络筒
+        }
+        return AjaxResult.success(0);
      }
 
     /**
-     * 操作日志信息统计
+     * 操作日志信息统计 （这个没办法做成共同的，因为，操作记录在主表当中）
      * Operation information statistics
      */
     @GetMapping("/getOperationInformationStatistics")
@@ -73,87 +96,110 @@ public class StatisticsController {
     }
 
     /**
-     * 操作日志信息统计
+     * 生产任务、 完成任务数量
      * Operation information statistics
      */
-    @GetMapping("/getLoginInformationStatistics")
-    public AjaxResult getLoginInformationStatistics(){
-        SysLogininfor sysLogininfor=new SysLogininfor();
-        sysLogininfor.setTenantId( SecurityUtils.getLoginUser().getTenantId());
-        sysLogininfor.setWhichApplication("1");
-        List<Map> loginInformationStatistics = logininforService.getLoginInformationStatistics(sysLogininfor);
-
-        SysLogininfor sysLogininfor2=new SysLogininfor();
-        sysLogininfor2.setTenantId( SecurityUtils.getLoginUser().getTenantId());
-        sysLogininfor2.setWhichApplication("2");
-        List<Map> loginInformationStatistics1 = logininforService.getLoginInformationStatistics(sysLogininfor2);
+    @GetMapping("/getProductionTaskCompletionQuantity")
+    public AjaxResult getProductionTaskCompletionQuantity(){
+        BpmExecuteProcess bpmExecuteProcess=new BpmExecuteProcess();
+        bpmExecuteProcess.setTaskProcessType("0");
+        //所有生产的，生产流程
+        List<Map> mapList1= bpmExecuteProcessService.selectBpmExecuteProcessListProductionCount(bpmExecuteProcess);
         List<Map> list = new ArrayList<>();
         HashMap hashMap1=new HashMap();
-        hashMap1.put("name","客户端");
+        hashMap1.put("name","生产任务");
         hashMap1.put("type","line");
         hashMap1.put("smooth","true");
-        hashMap1.put("data",loginInformationStatistics.stream().map((item->item.get("dailyLoginCount"))).collect(Collectors.toList()));
-        hashMap1.put("date",loginInformationStatistics.stream().map((item->item.get("loginDate"))).collect(Collectors.toList()));
+        hashMap1.put("data",mapList1.stream().map((item->item.get("count"))).collect(Collectors.toList()));
+        hashMap1.put("date",mapList1.stream().map((item->item.get("month"))).collect(Collectors.toList()));
         list.add(hashMap1);
+        BpmExecuteProcess bpmExecuteProcess2=new BpmExecuteProcess();
+        bpmExecuteProcess2.setTaskProcessType("0");
+        bpmExecuteProcess2.setTaskProcessState(3L);
+        //所有生产的，生产流程
+        List<Map> mapList2 = bpmExecuteProcessService.selectBpmExecuteProcessListProductionCount(bpmExecuteProcess2);
         HashMap hashMap2=new HashMap();
-        hashMap2.put("name","工具端");
+        hashMap2.put("name","完成任务");
         hashMap2.put("type","line");
         hashMap2.put("smooth","true");
-        hashMap2.put("data",loginInformationStatistics1.stream().map((item->item.get("dailyLoginCount"))).collect(Collectors.toList()));
-        hashMap2.put("date",loginInformationStatistics.stream().map((item->item.get("loginDate"))).collect(Collectors.toList()));
+        hashMap2.put("data",mapList2.stream().map((item->item.get("count"))).collect(Collectors.toList()));
+        hashMap2.put("date",mapList2.stream().map((item->item.get("month"))).collect(Collectors.toList()));
         list.add(hashMap2);
-        return AjaxResult.success(list);
+        return  AjaxResult.success(list);
     }
 
-
     /**
-     * 数据建模统计
+     * 原材料
      * DataModelingStatistics
      */
-    @GetMapping("/getDataModelingStatistics")
-    public AjaxResult getDataModelingStatistics(){
-        String databaseType = SecurityUtils.getDatabaseType();
-        if (databaseType.equals(DataSourceType.MYSQL.getDataSourceName())) {
-            CommonTableOperationVO vo =new CommonTableOperationVO();
-            vo.setDatabaseName(SecurityUtils.getDatabaseName());
-            return   AjaxResult.success(mysqlTableOperationService.selectTableList(vo).size());
+    @GetMapping("/getRawMaterial")
+    public AjaxResult getRawMaterial(){
+        if(SecurityUtils.getUsername().equals("huaxian")){
+            //总库存数量
+            int i1 = materialInventoryService.selectMaterialInventoryListSum();
+            //出库数量
+            int i2 = inboundRecordsService.selectInboundRecordsByQtCodeNumberCount();
+            //入库数量
+            int i3 = outboundRecordsService.selectOutboundRecordsCount();
+            List<Map> list=new ArrayList<>();
+            HashMap dragFormsMap=new HashMap();
+            dragFormsMap.put("name","总库存数量");
+            dragFormsMap.put("value",i1);
+            list.add(dragFormsMap);
+
+            HashMap dragTableSMap=new HashMap();
+            dragTableSMap.put("name","出库数量");
+            dragTableSMap.put("value",i2);
+            list.add(dragTableSMap);
+
+            HashMap dragTableGroupsSMap=new HashMap();
+            dragTableGroupsSMap.put("name","入库数量");
+            dragTableGroupsSMap.put("value",i3);
+            list.add(dragTableGroupsSMap);
+            return AjaxResult.success(list);
+        }else {
+            List<Map> list=new ArrayList<>();
+            HashMap dragFormsMap=new HashMap();
+            dragFormsMap.put("name","总库存数量");
+            dragFormsMap.put("value",0);
+            list.add(dragFormsMap);
+
+            HashMap dragTableSMap=new HashMap();
+            dragTableSMap.put("name","出库数量");
+            dragTableSMap.put("value",0);
+            list.add(dragTableSMap);
+
+            HashMap dragTableGroupsSMap=new HashMap();
+            dragTableGroupsSMap.put("name","入库数量");
+            dragTableGroupsSMap.put("value",0);
+            list.add(dragTableGroupsSMap);
+            return AjaxResult.success(list);
         }
-        return AjaxResult.success(0);
+
+
+
+
     }
 
+
     /**
-     * 表单表格统计
-     * DataModelingStatistics
+     * 最近12个月的客户端的登录情况
      */
-    @GetMapping("/getTabularStatistics")
-    public AjaxResult getTabularStatistics(){
-        //表单
-        DragForm  dragForm =new DragForm();
-        int dragFormsCount = dragFormService.selectDragFormListCount(dragForm);
-        //表格
-        DragTable dragTable =new DragTable();
-        int dragTablesCount = dragTableService.selectDragTableListCount(dragTable);
-        //三级联动
-        DragTableGroup dragTableGroup =new DragTableGroup();
-        int dragTableGroupsCount = dragTableGroupService.selectDragTableGroupListCount(dragTableGroup);
-
-        List<Map> list=new ArrayList<>();
-        HashMap dragFormsMap=new HashMap();
-        dragFormsMap.put("name","表单");
-        dragFormsMap.put("value",dragFormsCount);
-        list.add(dragFormsMap);
-
-        HashMap dragTableSMap=new HashMap();
-        dragTableSMap.put("name","表格");
-        dragTableSMap.put("value",dragTablesCount);
-        list.add(dragTableSMap);
-
-        HashMap dragTableGroupsSMap=new HashMap();
-        dragTableGroupsSMap.put("name","三级联动");
-        dragTableGroupsSMap.put("value",dragTableGroupsCount);
-        list.add(dragTableGroupsSMap);
-
-        return AjaxResult.success(list);
+    @GetMapping("/getLoginInformationStatistics")
+    public AjaxResult getLoginInfo(){
+        SysLogininfor logininfor=new SysLogininfor();
+        logininfor.setTenantId(SecurityUtils.getTenantId());
+        logininfor.setWhichApplication("1");
+        List<Map> loginInformationStatistics = logininforService.getLoginInformationStatistics(logininfor);
+        List<String> dates1=new ArrayList<>();
+        List<String> dates2=new ArrayList<>();
+        loginInformationStatistics.stream().forEach(item->{
+            dates1.add(item.get("month").toString());
+            dates2.add(item.get("loginCount").toString());
+        });
+        HashMap<String,Object> data=new HashMap<>();
+        data.put("name",dates1);
+        data.put("value",dates2);
+        return AjaxResult.success(data);
     }
-
 }

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/mapper/DetailsOfTheRefuelingPlanSpinningMapper.java

@@ -69,4 +69,10 @@ public interface DetailsOfTheRefuelingPlanSpinningMapper
      * @return 结果
      */
     public int deleteDetailsOfTheRefuelingPlanSpinningByIds(Long[] ids);
+
+    /**
+     * 查询纺丝加弹、翻框计划数量
+     * @return
+     */
+    int selectDetailsOfTheRefuelingPlanSpinningListCount();
 }

zkqy-custom-business/src/main/java/com/zkqy/business/service/IDetailsOfTheRefuelingPlanService.java

@@ -27,6 +27,13 @@ public interface IDetailsOfTheRefuelingPlanService
      */
     public List<DetailsOfTheRefuelingPlan> selectDetailsOfTheRefuelingPlanList(DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlan);
 
+    /**
+     * 查询加弹计划详细信息列表条数
+     *
+     * @return 加弹计划详细信息集合
+     */
+    public int selectDetailsOfTheRefuelingPlanListCount();
+
     /**
      * 新增加弹计划详细信息
      * 

zkqy-custom-business/src/main/java/com/zkqy/business/service/IDetailsOfTheRefuelingPlanSpinningService.java

@@ -29,6 +29,14 @@ public interface IDetailsOfTheRefuelingPlanSpinningService
      */
     public List<DetailsOfTheRefuelingPlanSpinningRVo> selectDetailsOfTheRefuelingPlanSpinningList(DetailsOfTheRefuelingPlanSpinningVo detailsOfTheRefuelingPlanSpinning);
 
+    /**
+     * 查询加弹计划详细信息列表
+     *
+     * @return 加弹计划详细信息集合
+     */
+    public int selectDetailsOfTheRefuelingPlanSpinningListCount();
+
+
     /**
      * 信息列表
      * @param detailsOfTheRefuelingPlanSpinning

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

@@ -59,6 +59,17 @@ public class DetailsOfTheRefuelingPlanServiceImpl implements IDetailsOfTheRefuel
         return detailsOfTheRefuelingPlanMapper.selectDetailsOfTheRefuelingPlanList(detailsOfTheRefuelingPlan);
     }
 
+    /**
+     * 查询加弹计划信息条数
+     *
+     * @return 加弹计划详细信息
+     */
+    @Override
+    public int selectDetailsOfTheRefuelingPlanListCount()
+    {
+        return detailsOfTheRefuelingPlanMapper.selectDetailsOfTheRefuelingPlanListCount();
+    }
+
     /**
      * 新增加弹计划详细信息
      * 

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

@@ -123,6 +123,11 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         return list;
     }
 
+    @Override
+    public int selectDetailsOfTheRefuelingPlanSpinningListCount() {
+       return detailsOfTheRefuelingPlanSpinningMapper.selectDetailsOfTheRefuelingPlanSpinningListCount();
+    }
+
 
     @Override
     public List<DetailsOfTheRefuelingPlanSpinning> selectDetailsOfTheRefuelingPlanSpinningListInfo(DetailsOfTheRefuelingPlanSpinningVo detailsOfTheRefuelingPlanSpinning) {

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-custom-business/src/main/resources/mapper/business/DetailsOfTheRefuelingPlanMapper.xml

@@ -66,7 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDetailsOfTheRefuelingPlanVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectDetailsOfTheRefuelingPlanListCount" resultType="java.lang.Integer">
+        select count(`id`) from {DBNAME}.details_of_the_refueling_plan
+    </select>
+
     <insert id="insertDetailsOfTheRefuelingPlan" parameterType="com.zkqy.business.domain.DetailsOfTheRefuelingPlan">
         insert into {DBNAME}.details_of_the_refueling_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">

zkqy-custom-business/src/main/resources/mapper/business/DetailsOfTheRefuelingPlanSpinningMapper.xml

@@ -57,7 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDetailsOfTheRefuelingPlanSpinningVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectDetailsOfTheRefuelingPlanSpinningListCount" resultType="java.lang.Integer">
+        select count(id) from {DBNAME}.details_of_the_refueling_plan_spinning where plan_status !=2
+    </select>
+
     <insert id="insertDetailsOfTheRefuelingPlanSpinning" parameterType="com.zkqy.business.domain.DetailsOfTheRefuelingPlanSpinning" useGeneratedKeys="true" keyProperty="id">
         insert into {DBNAME}.details_of_the_refueling_plan_spinning
         <trim prefix="(" suffix=")" suffixOverrides=",">

zkqy-custom-business/src/main/resources/mapper/business/MaterialInventoryMapper.xml

@@ -232,7 +232,7 @@
         where material_code = #{materialCode}
     </select>
     <select id="selectMaterialInventoryListSum" resultType="java.lang.Integer">
-        select sum(quantity) from {NAMEDB}.material_inventory
+        select sum(quantity) from {DBNAME}.material_inventory
     </select>
 
 </mapper>

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/mapper/BpmExecuteProcessMapper.java

@@ -5,6 +5,7 @@ import com.zkqy.execution.produce.dispersed.entity.BpmExecuteProcess;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.DragFormGroup;
 import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,7 @@ import java.util.Map;
  * @author hzh
  * @date 2023-11-01
  */
+@Mapper
 public interface BpmExecuteProcessMapper {
     /**
      * 查询流程执行任务
@@ -32,6 +34,23 @@ public interface BpmExecuteProcessMapper {
      */
     public List<BpmExecuteProcess> selectBpmExecuteProcessList(BpmExecuteProcess bpmExecuteProcess);
 
+
+    /**
+     * 查询流程执行任务列表数量(这个查询的是审批流的数量)
+     *
+     * @param bpmExecuteProcess 流程执行任务
+     * @return 流程执行任务集合
+     */
+    public int selectBpmExecuteProcessListCount(BpmExecuteProcess bpmExecuteProcess);
+
+
+    /**
+     * 查询流程执行任务列表数量(这个查询的是审批流的数量)
+     * @return 流程执行任务集合
+     */
+    public List<Map> selectBpmExecuteProcessListProductionCount(BpmExecuteProcess executeProcess);
+
+
     /**
      * 查询流程执行任务log
      *

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/runbpm/PreExecutionToolClass.java

@@ -180,6 +180,9 @@ public class PreExecutionToolClass<R> {
         runBpmExecuteProcess.setDelFlag("0");
         // *****替换当前执行流程的任务唯一标识
         intoProduction.setTaskProcessKey(runBpmExecuteProcess.getTaskKey());
+        runBpmExecuteProcess.setCreateById(SecurityUtils.getUserId());
+        runBpmExecuteProcess.setCreateTime(new Date());
+        runBpmExecuteProcess.setCreateBy(SecurityUtils.getUsername());
         // 执行新增方法
         runBpmExecuteProcessMapper.insertBpmExecuteProcess(runBpmExecuteProcess);
         // 新增计划表中绑定任务key编码

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/IBpmExecuteProcessService.java

@@ -31,6 +31,13 @@ public interface IBpmExecuteProcessService {
      */
     List<CommonEntity> selectBpmExecuteProcessList(BpmExecuteProcess bpmExecuteProcess) throws Exception;
 
+
+    /**
+     * 查询待执行的审批任务有多少条
+     * @return
+     */
+    public int  selectBpmExecuteProcessListCount();
+
     /**
      * 查询当前用户提交的审批流程记录
      *
@@ -39,6 +46,13 @@ public interface IBpmExecuteProcessService {
      */
     List<CommonEntity> selectBpmExecuteProcessApproveLogList(BpmExecuteProcess bpmExecuteProcess) throws Exception;
 
+    /**
+     * 近12个月的生产任务统计
+     *
+     * @return 流程执行任务集合
+     */
+    public List<Map> selectBpmExecuteProcessListProductionCount(BpmExecuteProcess bpmExecuteProcess);
+
     /**
      * 查询流程执行记录log列表
      *
@@ -105,7 +119,7 @@ public interface IBpmExecuteProcessService {
     /**
      * 通过formKeys查询表单信息
      *
-     * @param objectMap
+     * @param
      * @return
      */
     List<CommonEntity> getFromInfoByFormKeys(String[] formKeys);

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/BpmExecuteProcessServiceImpl.java

@@ -153,6 +153,20 @@ public class BpmExecuteProcessServiceImpl implements IBpmExecuteProcessService {
         return null;
     }
 
+
+    /**
+     * 查询流程执行任务列表 审批流
+     *
+     * @return 流程执行任务
+     */
+    @Override
+    public int  selectBpmExecuteProcessListCount(){
+        // 得到当前执行管道的列表关联信息d
+        BpmExecuteProcess bpmExecuteProcess=new BpmExecuteProcess();
+        return runBpmExecuteProcessMapper.selectBpmExecuteProcessListCount(bpmExecuteProcess);
+    }
+
+
     @Override
     public List<CommonEntity> selectBpmExecuteProcessApproveLogList(BpmExecuteProcess bpmExecuteProcess) {
         Map<String, Object> objectMap = new HashMap<>();  // 查询执行管道的参数
@@ -167,6 +181,12 @@ public class BpmExecuteProcessServiceImpl implements IBpmExecuteProcessService {
         return commonEntities;
     }
 
+    @Override
+    public List<Map> selectBpmExecuteProcessListProductionCount(BpmExecuteProcess bpmExecuteProcess){
+        List<Map> maps = runBpmExecuteProcessMapper.selectBpmExecuteProcessListProductionCount(bpmExecuteProcess);
+        return maps;
+    }
+
     @Override
     public List<CommonEntity> selectBpmExecuteProcessListLog(BpmExecuteProcess bpmExecuteProcess) {
         SysDictData dictData = new SysDictData();

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-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -637,6 +637,28 @@
         </if>
         order by ben.create_time desc
     </select>
+    <select id="selectBpmExecuteProcessListCount" resultType="java.lang.Integer">
+        select count(id)
+        from {DBNAME}.bpm_execute_process where task_process_state =0 and task_process_type=1
+    </select>
+    <select id="selectBpmExecuteProcessListProductionCount" resultType="map" parameterType="com.zkqy.execution.produce.dispersed.entity.BpmExecuteProcess">
+        SELECT
+            DATE_FORMAT(date_sub(CURDATE(), INTERVAL m.month MONTH), '%Y-%m') AS month,
+    COALESCE(COUNT(bpm_execute_process.create_time), 0) AS count
+        FROM
+            (SELECT 0 AS month UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10 UNION ALL SELECT 11) AS m
+            LEFT JOIN
+            {DBNAME}.bpm_execute_process ON DATE_FORMAT(bpm_execute_process.create_time, '%Y-%m') = DATE_FORMAT(date_sub(CURDATE(), INTERVAL m.month MONTH), '%Y-%m')
+            AND  {DBNAME}.bpm_execute_process.task_process_type = #{taskProcessType}
+                <if test="taskProcessState != null  and taskProcessState != ''">
+                    and    task_process_state=#{taskProcessState}
+                </if>
+
+        GROUP BY
+            DATE_FORMAT(date_sub(CURDATE(), INTERVAL m.month MONTH), '%Y-%m')
+        ORDER BY
+            DATE_FORMAT(date_sub(CURDATE(), INTERVAL m.month MONTH), '%Y-%m') DESC;
+    </select>
 
     <update id="updateProcessStateByKey">
         update {DBNAME}.bpm_execute_process

zkqy-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -49,95 +49,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getLoginInformationStatistics" resultType="map">
         SELECT
-        d.date AS login_date,
-        COUNT( l.info_id ) AS daily_login_count
-        FROM
-        (
-        SELECT
-        CURDATE() - INTERVAL seq DAY AS date
-        FROM
-        (
-        SELECT
-        @ROW := @ROW + 1 AS seq
-        FROM
-        (
-        SELECT
-        0 UNION ALL
-        SELECT
-        1 UNION ALL
-        SELECT
-        3 UNION ALL
-        SELECT
-        4 UNION ALL
-        SELECT
-        5 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        7 UNION ALL
-        SELECT
-        8 UNION ALL
-        SELECT
-        9
-        ) t1,
-        (
-        SELECT
-        0 UNION ALL
-        SELECT
-        1 UNION ALL
-        SELECT
-        3 UNION ALL
-        SELECT
-        4 UNION ALL
-        SELECT
-        5 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        7 UNION ALL
-        SELECT
-        8 UNION ALL
-        SELECT
-        9
-        ) t2,
-        (
-        SELECT
-        0 UNION ALL
-        SELECT
-        1 UNION ALL
-        SELECT
-        3 UNION ALL
-        SELECT
-        4 UNION ALL
-        SELECT
-        5 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        6 UNION ALL
-        SELECT
-        7 UNION ALL
-        SELECT
-        8 UNION ALL
-        SELECT
-        9
-        ) t3,
-        ( SELECT @ROW := 0 ) r
-        ) v
-        WHERE
-           <![CDATA[seq <= 30 ]]>
-        ) d
-        LEFT JOIN sys_logininfor l ON DATE( l.login_time ) = d.date
-        AND l.tenant_id =#{tenantId}
-        AND l.which_application =#{whichApplication}
-        GROUP BY
-        d.date
+            m.month,
+            COALESCE(t.login_count, 0) AS login_count
+        FROM (
+                 SELECT DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL n MONTH), '%Y-%m') AS month
+                 FROM (
+                     SELECT 0 n UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL
+                     SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10 UNION ALL SELECT 11
+                     ) t
+             ) m
+                 LEFT JOIN (
+            SELECT
+                DATE_FORMAT(login_time, '%Y-%m') AS month,
+        COUNT(*) AS login_count
+            FROM
+               sys_logininfor
+            WHERE
+                tenant_id=#{tenantId} AND
+                which_application =#{whichApplication} AND
+                login_time >= CURDATE() - INTERVAL 1 YEAR
+            GROUP BY
+                month
+        ) t ON m.month = t.month
         ORDER BY
-        d.date;
+            m.month DESC;
     </select>
 
     <delete id="deleteLogininforByIds" parameterType="Long">

zkqy-ui/src/api/homePage/index.js

@@ -11,7 +11,7 @@ export function getTask() {
 //管道统计
 export function getPipeline() {
    return request({
-     url: '/statistics/info/getLoginInformationStatistics',
+     url: '/statistics/info/getProductionTaskCompletionQuantity',
      method: 'get',
    })
 }
@@ -27,7 +27,7 @@ export function getOperation() {
 //原材料统计
 export function getMaterial() {
     return request({
-      url: '/statistics/info/getTabularStatistics',
+      url: '/statistics/info/getRawMaterial',
       method: 'get',
     })
 }
@@ -35,7 +35,7 @@ export function getMaterial() {
 //用户登录统计
 export function getLogin() {
     return request({
-      url: '/statistics/info/getDataModelingStatistics',
+      url: '/statistics/info/getLoginInformationStatistics',
       method: 'get',
     })
-}
+}

zkqy-ui/src/layout/components/AppMain.vue

@@ -34,7 +34,7 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
-  background-color: #ffffff;
+  background-color: #eff2f7;
 }
 
 .fixed-header + .app-main {

zkqy-ui/src/views/index.vue

@@ -90,6 +90,398 @@ export default {
     };
   },
   methods: {
+    initData() {
+      //任务统计
+      getTask().then((response) => {
+        if (response.code == 200) {
+          this.processList = response.data;
+          //   console.log(this.processList);
+          this.chartObj.myChart1.setOption({
+            series: [
+              {
+                data: response.data,
+              },
+            ],
+          });
+        } else {
+          console.log(response);
+          this.$message.error("获取数据失败");
+        }
+      });
+
+      //管道统计
+      getPipeline().then((response) => {
+        if (response.code == 200) {
+          //  console.log(response.data);
+          //  console.log(response.data[0].date);
+          let xAxisData = response.data[0].date;
+          xAxisData = xAxisData.map(function (dateStr) {
+            var date = new Date(dateStr);
+            return date.getMonth() + 1 + "月" + date.getDate() + "日";
+          });
+          let loginList = response.data.map((item) => item.name);
+          this.chartObj.myChart2.setOption({
+            legend: {
+              data: loginList,
+            },
+            xAxis: {
+              data: xAxisData,
+            },
+            series: response.data,
+          });
+        } else {
+          console.log(response);
+          this.$message.error("获取数据失败");
+        }
+      });
+
+      //操作日志
+      getOperation().then((response) => {
+        if (response.code == 200) {
+          this.swiperList = response.data;
+          this.$nextTick(() => {
+            var swiper = new Swiper(".swiper-container", {
+              direction: "vertical",
+              loop: true,
+              autoplay: {
+                delay: 1000,
+                disableOnInteraction: false,
+              },
+              scrollbar: {
+                el: ".swiper-scrollbar",
+              },
+              slidesPerView: 3,
+              freeMode: true,
+              // spaceBetween: 1,
+            });
+          });
+        } else {
+          console.log(response);
+          this.$message.error("获取数据失败");
+        }
+      });
+
+      //原材料统计
+      getMaterial().then((response) => {
+        if (response.code == 200) {
+          //  console.log(response.data);
+          let tabularList = response.data;
+          //  tabularList.push({ name: "多表数量", value: 30 });
+          let labelList = response.data.map((item) => item.name);
+          this.chartObj.myChart3.setOption({
+            yAxis: {
+              data: labelList,
+            },
+            series: [
+              {
+                data: response.data,
+              },
+            ],
+          });
+        } else {
+          console.log(response);
+          this.$message.error("获取数据失败");
+        }
+      });
+
+      //用户登录统计
+      getLogin().then((response) => {
+        if (response.code == 200) {
+          // data.put("name",dates1);
+          // data.put("value",dates2);
+          let modelData = response.data;
+          //  console.log(modelData);
+          this.chartObj.myChart4?.setOption({
+            series: [
+              {
+                data: modelData.value,
+              },
+            ],
+            xAxis: {
+              data: modelData.name,
+            },
+          });
+        } else {
+          console.log(response);
+          this.$message.error("获取数据失败");
+        }
+      });
+    },
+
+    initChart1() {
+      this.chartObj.myChart1 = this.$echarts.init(this.$refs.pieChart);
+      let option = {
+        color: ["#9370db", "#ffd700", "#00ccff", "#ff6600", "#ff9900"],
+        title: {
+          text: "任务统计",
+          left: "left",
+          textStyle: {
+            fontSize: 16,
+            fontWeight: "normal",
+            color: "#696969",
+          },
+        },
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          left: "60%",
+          top: "60%",
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: "pie",
+            radius: ["40%", "100%"],
+            avoidLabelOverlap: false,
+            itemStyle: {
+              // borderRadius: 10,
+              borderColor: "#fff",
+              borderWidth: 2,
+            },
+            right: "40%",
+            top: "50%",
+            data: [
+              { value: 10, name: "工艺流" },
+              { value: 20, name: "审批流" },
+            ],
+            label: {
+              show: false,
+              position: "center",
+            },
+            labelLine: {
+              show: false,
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: 20,
+                fontWeight: "bold",
+              },
+            },
+          },
+        ],
+      };
+      this.chartObj.myChart1.setOption(option);
+    },
+
+    initChart2() {
+      this.chartObj.myChart2 = this.$echarts.init(this.$refs.lineChart);
+      let option = {
+        color: ["#FF88E0", "#9FE080"],
+        title: {
+          text: "生产任务统计",
+          textStyle: {
+            fontSize: 16,
+            fontWeight: "normal",
+            color: "#696969",
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        legend: {
+          data: ["在产生产任务", "完成数量"],
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          top: "20%",
+          bottom: "0%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: [
+            "01\nMon",
+            "02\nTue",
+            "03\nWed",
+            "04\nThu",
+            "05\nFri",
+            "06\nSat",
+            "07\nSun",
+            "08\nMon",
+            "09\nTue",
+            "10\nWed",
+            "11\nThu",
+            "12\nFri",
+            "13\nSat",
+            "14\nSun",
+            "15\nMon",
+            "16\nTue",
+            "17\nWed",
+            "18\nThu",
+            "19\nFri",
+            "20\nSat",
+            "21\nSun",
+            "22\nMon",
+            "23\nTue",
+            "24\nWed",
+            "25\nThu",
+            "26\nFri",
+            "27\nSat",
+            "28\nSun",
+            "29\nMon",
+            "30\nTue",
+          ],
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: [
+          {
+            name: "客户端",
+            type: "line",
+            smooth: true,
+            data: [
+              10, 23, 42, 13, 30, 25, 40, 30, 42, 55, 40, 28, 20, 30, 45, 25,
+              20, 30, 40, 33, 35, 40, 46, 31, 13, 34, 20, 10, 36, 43,
+            ],
+          },
+          {
+            name: "工具端",
+            type: "line",
+            smooth: true,
+            data: [
+              20, 30, 29, 40, 55, 33, 30, 26, 36, 45, 50, 34, 38, 25, 28, 43,
+              16, 30, 45, 52, 40, 46, 33, 57, 50, 33, 40, 59, 56, 56,
+            ],
+          },
+        ],
+      };
+      this.chartObj.myChart2.setOption(option);
+    },
+
+    initChart3() {
+      this.chartObj.myChart3 = this.$echarts.init(this.$refs.gaugeChart);
+      let option = {
+        color: ["#00ccff", "#ff6600", "#ff9900", "#9370db", "#ffd700"],
+        title: {
+          text: "原材料统计",
+          left: "left",
+          textStyle: {
+            fontSize: 16,
+            fontWeight: "normal",
+            color: "#696969",
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        grid: {
+          left: "0%",
+          right: "3%",
+          top: "20%",
+          bottom: "0%",
+          containLabel: true,
+        },
+        xAxis: {
+          type: "value",
+          nameLocation: "middle",
+          nameTextStyle: {
+            align: "center",
+          },
+          splitLine: {
+            show: false,
+          },
+        },
+
+        yAxis: {
+          type: "category",
+          data: ["总数", "入库数量", "出库数量"],
+          inverse: true, // 使类目从右向左排列
+        },
+
+        series: [
+          {
+            type: "bar",
+            barWidth: "18",
+            orientation: "horizontal",
+            data: [
+              { value: 88, name: "表单" },
+              { value: 66, name: "表格" },
+              { value: 33, name: "三级联动" },
+            ],
+            showBackground: true,
+            backgroundStyle: {
+              color: "#F0F8FF",
+            },
+          },
+        ],
+      };
+      this.chartObj.myChart3.setOption(option);
+    },
+
+    initChart4() {
+      this.chartObj.myChart4 = this.$echarts.init(this.$refs.barChart);
+      let option = {
+        color: ["#5D84FE"],
+        title: {
+          text: "用户登录统计",
+          textStyle: {
+            fontSize: 16,
+            fontWeight: "normal",
+            color: "#696969",
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [
+            "1月",
+            "2月",
+            "3月",
+            "4月",
+            "5月",
+            "6月",
+            "7月",
+            "8月",
+            "9月",
+            "10月",
+            "11月",
+            "12月",
+          ],
+        },
+        yAxis: {
+          type: "value",
+          min: 0,
+          max: 100,
+          interval: 20,
+          splitLine: {
+            show: false, // 关闭y轴的水平分割线
+          },
+        },
+        grid: {
+          left: "5%",
+          right: "5%",
+          top: "30%",
+          bottom: "0%",
+          containLabel: true,
+        },
+        series: [
+          {
+            data: [0],
+            type: "bar",
+            barWidth: "30", // 设置柱体宽度
+            showBackground: true,
+            backgroundStyle: {
+              color: "#E8EFFF",
+            },
+          },
+        ],
+      };
+      this.chartObj.myChart4.setOption(option);
+    },
+
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "用户导入";

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

@@ -45,6 +45,7 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item @click.native.prevent="handleAddPlan(scope.row)">新增计划</el-dropdown-item>
                   <el-dropdown-item @click.native.prevent="handleEditPlan(scope.row)">修改计划</el-dropdown-item>
+                  <el-dropdown-item @click.native.prevent="handleStopProductionLine(scope.row)">机台状态</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -440,13 +441,13 @@
           </el-form>
           <!--表格-->
           <el-table :data="tableData2" @row-click.self="handleRowClick">
-            <el-table-column prop="salesmanId" label="业务员" header-align="center" align="center" width="100px">
-              <template v-slot:default="scope">
-                <el-select  :ref="'salesmanSelect'+scope.$index"  v-model="scope.row.salesmanId" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.salesmanId,scope.$index)">
-                  <el-option v-for="salesmanItem in salesmanInfo" :key="salesmanItem.saleNo" :label="salesmanItem.salesman" :value="salesmanItem.saleNo" ></el-option>
-                </el-select>
-              </template>
-            </el-table-column>
+<!--            <el-table-column prop="salesmanId" label="业务员" header-align="center" align="center" width="100px">-->
+<!--              <template v-slot:default="scope">-->
+<!--                <el-select  :ref="'salesmanSelect'+scope.$index"  v-model="scope.row.salesmanId" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.salesmanId,scope.$index)">-->
+<!--                  <el-option v-for="salesmanItem in salesmanInfo" :key="salesmanItem.saleNo" :label="salesmanItem.salesman" :value="salesmanItem.saleNo" ></el-option>-->
+<!--                </el-select>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column prop="productId" label="产品" header-align="center" align="center" width="150px">
               <template v-slot:default="scope">
                 <el-select  :ref="'productSelected'+scope.$index" v-model="scope.row.productId" placeholder="请选择待排产产品" @change="selectedChangeDate(scope.row,scope.row.productId)">
@@ -543,7 +544,21 @@
            </span>
         </el-dialog>
       </el-tab-pane>
-
+      <!--停机弹窗-->
+      <el-dialog title="修改机台状态"  :visible.sync="modifyMachineStatus" width="500px">
+                  <el-form :model="modifyMachineStatusFrom"  ref="modifyMachineStatusFrom" label-width="100px" class="demo-ruleForm">
+                    <el-form-item label="机台状态" prop="type">
+                      <el-checkbox-group v-model="modifyMachineStatusFrom.type">
+                        <el-checkbox label="1" name="type">A面停机</el-checkbox>
+                        <el-checkbox label="2" name="type">B面停机</el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button type="primary" @click="confirmStopProductionLine">确定</el-button>
+                      <el-button>取消</el-button>
+                    </el-form-item>
+                  </el-form>
+      </el-dialog>
     </el-tabs>
 
   </div>
@@ -561,6 +576,10 @@ import {
 export default {
   data() {
     return {
+      modifyMachineStatusFrom:{
+        type: [],
+      },
+      modifyMachineStatus:false,
       //选中的是那个车间
       selectedWorkshop:"南车间",
       tableData:[],
@@ -619,6 +638,64 @@ export default {
     this.getProductsInfo();
   },
   methods: {
+    handleStopProductionLine(row){
+      this.modifyMachineStatus=true;
+      console.log("停机");
+      this.machineId=row.machineId;
+    },
+    confirmStopProductionLine(rwo){
+      if (this.modifyMachineStatusFrom.includes(1)) {
+          console.log('数组中包含数字 1');
+         //新增一条数据,
+         let aStopInfo=   {
+              currentColorCode: '',
+              currentSpecification: '',
+              currentLotNumber: '',
+              currentSpindleCount: '',
+              number: '',
+              productType:'A面',
+              startTime: '',
+              plannedEndTime:'',
+              planStatus:2,
+              productId:'',
+              machineId:this.machineId,
+              salesmanId:'',
+              timestampRandomCode:Date.now()+this.machineId,
+         }
+         let aStoptableList=[];
+        aStoptableList.push(aStopInfo)
+        //时间戳
+        let data={
+          //机台号
+          machineId: this.machineId,
+          timestampRandomCode:Date.now()+this.machineId,
+          //计划信息
+          detailsOfTheRefuelingPlans: aStoptableList
+        }
+        //添加计划信息
+        addMaterielInfo(data).then(response => {
+          if (response.code == 200) {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            });
+            this.getAmmunitionPlanInfo();
+            //最后把弹窗关掉
+            this.nanInsertDialogTableVisible=false
+            //更改订单投产信息的批号,
+          } else {
+            this.$message({
+              message: '添加失败',
+              type: 'error'
+            });
+            //最后把弹窗关掉
+            this.nanInsertDialogTableVisible=false
+          }
+        });
+      } else if(this.modifyMachineStatusFrom.includes(2)) {
+         console.log('数组中不包含数字 2');
+      }
+    },
     // 查询排产信息
     getAmmunitionPlanInfo() {
       ammunitionPlanInfo(this.queryParams).then((response) => {
@@ -663,7 +740,6 @@ export default {
         let nextRow2 = this.tableData[rowIndex + 1] //下一行数据
         // 当上一行的数据等于当前行数据时，当前行单元格隐藏
 
-        console.log(row.listOfPendingProduction)
         if(row.listOfPendingProduction==null||row.listOfPendingProduction==undefined|| row.listOfPendingProduction==""){
           return;
         }
@@ -962,13 +1038,12 @@ export default {
           item.productId=parseInt(item.productId)
         })
         this.tableData2=response.data;
-        console.log( this.tableData2)
+        // console.log( this.tableData2)
         // 在数据加载完成后，手动触发每个行的第一个下拉框的 change 事件
         this.$nextTick(() => {
           // 获取第一个业务员选择框（假设表格只有一行）
           for (let i = 0; i < this.tableData2.length; i++) {
             const firstSalesmanSelect = this.$refs['salesmanSelect'+i];
-            // console.log(firstSalesmanSelect,11111111)
             // 触发 change 事件
             if (firstSalesmanSelect) {
               firstSalesmanSelect.$emit('change', {
@@ -996,7 +1071,7 @@ export default {
     },
     //更新状态
     updateStatus(ind, row){
-      console.log(row);
+      // console.log(row);
       updatePlanOne(row).then(response=>{
         if (response.code == 200) {
           this.$message({

zkqy-ui/src/views/orderMange/planTable/show/fangsi.vue

@@ -14,44 +14,12 @@
             <el-table-column prop="plannedEndTime" label="下机时间" header-align="center" width="90px" align="center"></el-table-column>
           </el-table-column>
           <el-table-column prop="plannedProduction" label="待生产产品列表" header-align="center" align="center"  >
-<!--            <template v-slot:default="scope">-->
-<!--              <div v-if="scope.row.plannedProduction && scope.row.plannedProduction.length > 0">-->
-<!--                <div v-for="(chunk, chunkIndex) in splitList(scope.row.plannedProduction, 5)" :key="`chunk-${chunkIndex}`">-->
-<!--                  <span v-for="(item, index) in chunk" :key="`item-${chunkIndex}-${index}`">-->
-<!--                    {{ item }}, &lt;!&ndash; 替换为实际显示每个产品的代码 &ndash;&gt;-->
-<!--                  </span>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--              <div v-else>-->
 
-<!--              </div>-->
-<!--            </template>-->
           </el-table-column>
-<!--          <el-table-column   fixed="right" label="操作" header-align="center" align="center" width="150px" >-->
-<!--            <template v-slot:default="scope">-->
-<!--              <el-dropdown>-->
-<!--                <el-button type="primary">-->
-<!--                  操作-->
-<!--                  <i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-<!--                </el-button>-->
-<!--                <el-dropdown-menu slot="dropdown">-->
-<!--                  <el-dropdown-item @click.native.prevent="handleAddPlan(scope.row)">新增计划</el-dropdown-item>-->
-<!--                  <el-dropdown-item @click.native.prevent="handleEditPlan(scope.row)">修改计划</el-dropdown-item>-->
-<!--                </el-dropdown-menu>-->
-<!--              </el-dropdown>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
         </el-table>
         <!--新增计划弹窗-->
         <el-dialog title="新增计划"  :visible.sync="nanInsertDialogTableVisible" width="1200px">
           <el-table :data="tableData2" @row-click.self="handleRowClick">
-<!--            <el-table-column prop="salesmanId" label="业务员" header-align="center" align="center" width="100px">-->
-<!--              <template v-slot:default="scope">-->
-<!--                <el-select  v-model="scope.row.salesmanId" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.salesmanId)">-->
-<!--                  <el-option v-for="salesmanItem in salesmanInfo" :key="salesmanItem.saleNo" :label="salesmanItem.salesman" :value="salesmanItem.saleNo" ></el-option>-->
-<!--                </el-select>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
             <el-table-column prop="productId" label="产品" header-align="center" align="center" width="150px">
                 <template v-slot:default="scope">
                      <el-select  v-model="scope.row.productId" placeholder="请选择待排产产品" @change="selectedChangeDate(scope.row,scope.row.productId)">
@@ -147,13 +115,6 @@
           </el-form>
           <!--表格-->
           <el-table :data="tableData2" @row-click.self="handleRowClick">
-<!--            <el-table-column prop="salesmanId" label="业务员" header-align="center" align="center" width="100px">-->
-<!--              <template v-slot:default="scope">-->
-<!--                <el-select  :ref="'salesmanSelect'+scope.$index"  v-model="scope.row.salesmanId" placeholder="请选择业务员" @change="selectedSalesmanItem(scope.row,scope.row.salesmanId,scope.$index)">-->
-<!--                  <el-option v-for="salesmanItem in salesmanInfo" :key="salesmanItem.saleNo" :label="salesmanItem.salesman" :value="salesmanItem.saleNo" ></el-option>-->
-<!--                </el-select>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
             <el-table-column prop="productId" label="产品" header-align="center" align="center" width="150px">
               <template v-slot:default="scope">
                 <el-select  :ref="'productSelected'+scope.$index" v-model="scope.row.productId" placeholder="请选择待排产产品" @change="selectedChangeDate(scope.row,scope.row.productId)">