生产计划看板

mes/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java

@@ -234,6 +234,10 @@ public class UserConstants
     public static final String BARCODE_TYPE_SN = "SN";
     public static final String BARCODE_TYPE_RMSBOX = "BOX"; //料框
 
+    public static final String MACHINERY_CODE_STOP = "STOP";
+    public static final String MACHINERY_CODE_WORK = "WORKING";
+    public static final String MACHINERY_CODE_REPAIR = "REPAIR";
+
     /**
      * 消息状态
      */

mes/ktg-framework/src/main/java/com/ktg/framework/config/SecurityConfig.java

@@ -101,6 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         , "/register"
                         , "/captchaImage"
                         , "/listAll"
+                        , "/pro/plan/getToday"
                         , "/getRunDay"
                         , "/selectTotal"
                         , "/selectLineByTime"
@@ -108,6 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         , "/v18/http/post_detected_picture").anonymous()
                 .antMatchers("/mobile/login/**"
                         , "/listAll"
+                        , "/pro/plan/getToday"
                         , "/getRunDay"
                         , "/selectTotal"
                         , "/selectLineByTime"

mes/ktg-mes/src/main/java/com/ktg/mes/idx/controller/IndexController.java

@@ -1,9 +1,12 @@
 package com.ktg.mes.idx.controller;
 
+import com.ktg.common.constant.UserConstants;
 import com.ktg.common.core.controller.BaseController;
 import com.ktg.common.core.domain.AjaxResult;
 import com.ktg.common.core.domain.entity.ItemType;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.mes.dv.domain.DvMachinery;
+import com.ktg.mes.dv.service.IDvMachineryService;
 import com.ktg.mes.idx.domain.IndexResult;
 import com.ktg.mes.md.domain.MdItem;
 import com.ktg.mes.md.domain.RmsTaskInstock;
@@ -62,6 +65,8 @@ public class IndexController extends BaseController {
     private IMdItemService mdItemService;
     @Autowired
     private IWmStatisticsParamService wmStatisticsParamService;
+    @Autowired
+    private IDvMachineryService machineryService;
 
     /**
      * 获取统计数据
@@ -113,6 +118,8 @@ public class IndexController extends BaseController {
         WmStorageArea wmStorageArea = new WmStorageArea();
         wmStorageArea.setStatus("0");
         wmStorageAreaEmptyList = wmStorageAreaService.selectWmStorageAreaList(wmStorageArea);
+
+        int machineryCount = machineryService.selectDvMachineryList(new DvMachinery()).size();
         /*RmsLift rmsLiftGdc = new RmsLift();
         rmsLiftGdc.setDeviceType("1");
         List<RmsLift> rmsLiftsGdc = rmsLiftService.selectRmsLiftList(rmsLiftGdc);
@@ -190,6 +197,7 @@ public class IndexController extends BaseController {
         indexResult.setLiftAgvAvgTime(liftAgvAvgTime);
         indexResult.setLiftXcAvgTime(liftXcAvgTime);*/
         indexResult.setTaskWaitNum(taskWaitNum);
+        indexResult.setMachineryNum(machineryCount);
 
         return AjaxResult.success(indexResult);
     }
@@ -204,6 +212,27 @@ public class IndexController extends BaseController {
         return AjaxResult.success(statisticsParam);
     }
 
+    /**
+     * 获取设备统计数据
+     */
+    @GetMapping("/indexMachinery")
+    public AjaxResult indexGetMachinery()
+    {
+        DvMachinery dvMachinery = new DvMachinery();
+        dvMachinery.setStatus(UserConstants.MACHINERY_CODE_STOP);
+        int stopM = machineryService.selectDvMachineryList(dvMachinery).size();
+        dvMachinery.setStatus(UserConstants.MACHINERY_CODE_STOP);
+        int workM = machineryService.selectDvMachineryList(dvMachinery).size();
+        dvMachinery.setStatus(UserConstants.MACHINERY_CODE_STOP);
+        int reparidM = machineryService.selectDvMachineryList(dvMachinery).size();
+        Map<String, Integer> machineryList = new HashMap<>();
+
+        machineryList.put("stopNum", stopM);
+        machineryList.put("workNum", workM);
+        machineryList.put("reparidNum", reparidM);
+        return AjaxResult.success(machineryList);
+    }
+
 
     @GetMapping("/getMonthInstockCount2")
     public AjaxResult getMonthInstockCount()

mes/ktg-mes/src/main/java/com/ktg/mes/idx/domain/IndexResult.java

@@ -27,6 +27,7 @@ public class IndexResult {
     public  int liftXcAvgTime;
     public  int taskWaitNum;
     public int totalItem;
+    public int machineryNum;
 
     public int getEmptyBoxNum() {
         return emptyBoxNum;
@@ -235,4 +236,12 @@ public class IndexResult {
     public void setTotalItem(int totalItem) {
         this.totalItem = totalItem;
     }
+
+    public int getMachineryNum() {
+        return machineryNum;
+    }
+
+    public void setMachineryNum(int machineryNum) {
+        this.machineryNum = machineryNum;
+    }
 }

mes/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/DvMachineryDataServiceImpl.java

@@ -41,7 +41,6 @@ public class DvMachineryDataServiceImpl implements IDvMachineryDataService
      * @return 运行记录
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<DvMachineryData> selectDvMachineryDataList(DvMachineryData dvMachineryData)
     {
         return dvMachineryDataMapper.selectDvMachineryDataList(dvMachineryData);

mes/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProPlanController.java

@@ -134,7 +134,6 @@ public class ProPlanController extends BaseController
     /**
      * 获取生产计划详细信息
      */
-    @PreAuthorize("@ss.hasPermi('mes:pro:plan:query')")
     @GetMapping(value = "/getToday")
     public AjaxResult getToday()
     {

mes/mes-ui/src/api/mes/index.js

@@ -56,3 +56,10 @@ export function indexCount2() {
         method: 'get'
     })
 }
+
+export function indexMachinery() {
+    return request({
+        url: '/mes/idx/index/indexMachinery',
+        method: 'get'
+    })
+}

mes/mes-ui/src/permission.js

@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 //const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/loginPad']
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/injection']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/injection', '/proplan']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

mes/mes-ui/src/views/dashboard/PanelGroupMes.vue

@@ -29,7 +29,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" style="padding-left: 10px; padding-right: 10px;">
-      <div class="card-panel cp3" @click="handleOpen('box')">
+      <div class="card-panel cp3" @click="handleOpen('mditem')">
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="listing" class-name="card-panel-icon" />
         </div>
@@ -43,14 +43,14 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" style="padding-left: 10px; padding-right: 10px;">
-      <div class="card-panel cp4" @click="handleOpen('area')">
+      <div class="card-panel cp4" @click="handleOpen('machinery')">
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="jixiao" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
-          <count-to :start-val="0" :end-val="emptyAreaNum" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="machineryNum" :duration="3200" class="card-panel-num" />
           <div class="card-panel-text">
-            库位数量
+            设备数量
           </div>
         </div>
       </div>
@@ -72,6 +72,7 @@ export default {
       emptyAreaNum: 0,
       outstockQuantity: 0,
       emptyBoxNum: 0,
+      machineryNum: 0,
       areaBoxNum: 0,
       liftNum:0,
       liftGdcNum:0,
@@ -114,6 +115,7 @@ export default {
         this.liftAvgTime = resp.liftAvgTime;
         this.taskWaitNum = resp.taskWaitNum;
         this.totalItem = resp.totalItem;
+        this.machineryNum = resp.machineryNum;
       });
     },
     handleOpen(type,detail){
@@ -123,8 +125,12 @@ export default {
         this.$router.push({ path: '/mes/rms/outstock', query: {} })
       }else if(type === "box"){
         this.$router.push({ path: '/mes/rms/box', query: {} })
+      }else if(type === "mditem"){
+        this.$router.push({ path: '/mes/md/mditem', query: {} })
       }else if(type === "area"){
-        this.$router.push({ path: '/mes/wm/area/index', query: {} })
+        this.$router.push({ path: '/mes/wm/area', query: {} })
+      }else if(type === "machinery"){
+        this.$router.push({ path: '/mes/dv/machinery', query: {} })
       }else if(type === "lift"){
         this.$router.push({ path: '/mes/rms/lift', query: {} })
       }else if(type === "taskPool"){

mes/mes-ui/src/views/index_mes.vue

@@ -5,7 +5,7 @@
     <el-row :gutter="32">
       <el-col :xs="24" :sm="24" :lg="8">
         <div class="chart-wrapper">
-          <pie-chart-lift-count />
+         <pie-chart-machinery />
         </div>
       </el-col>
       <!-- <el-col :xs="24" :sm="24" :lg="8">
@@ -48,10 +48,11 @@ import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
 import BarChart1 from './dashboard/BarChart1'
 import { listAllUnitmeasure} from "@/api/mes/md/unitmeasure";
-import LineChartInstock from './dashboard/LineChartInstock'
-import LineChartOutstock from './dashboard/LineChartOutstock'
+import LineChartInstock from './dashboard/LineChartInstock';
+import LineChartOutstock from './dashboard/LineChartOutstock';
 import BarChart from "./dashboard/BarChart.vue";
-import PieChart from "./dashboard/PieChart.vue";
+import PieChart from './dashboard/PieChart.vue';
+import PieChartMachinery from "./dashboard/PieChartMachinery.vue";
 import PieChartLiftCount from "./dashboard/PieChartLiftCount.vue";
 import PieChartTaskTime from "./dashboard/PieChartTaskTime.vue";
 import BarChartLocation from './dashboard/BarChartLocation'
@@ -82,8 +83,8 @@ const lineChartData = {
 export default {
   name: 'Index',
   components: {
-    PieChart,
     BarChart,
+    PieChart,
     PanelGroupMes,
     LineChart,
     RaddarChart,
@@ -92,7 +93,8 @@ export default {
     LineChartOutstock,
     PieChartLiftCount,
     PieChartTaskTime,
-    BarChartLocation
+    BarChartLocation,
+    PieChartMachinery
   },
   data() {
     return {