add:统计分析质量检测分析;足盘模糊查询

mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/controller/QualityController.java

@@ -21,6 +21,8 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.wms.analysis_manage.qlmanage.dto.QualityQuery;
+import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
+import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
 import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
 import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService;
 import org.nl.wms.product_manage.service.workprocedure.dao.PdmBiWorkprocedure;
@@ -47,6 +49,8 @@ public class QualityController {
     private IPdmProduceWorkorderService workorderService;
     @Autowired
     private IPdmBiWorkprocedureService workprocedureService;
+    @Autowired
+    private IPdmBiDeviceService deviceService;
 
     @GetMapping()
     @Log("查询质量分析")
@@ -186,4 +190,95 @@ public class QualityController {
     }
 
 
+    @GetMapping("/bydevice")
+    @Log("查询质量分析")
+    public ResponseEntity<Object> bydevice(QualityQuery query, PageQuery page) {
+        long between = 30;
+        between = checkDateLimit(query, between);
+
+        QueryWrapper<PdmBiDevice> wrapper = new QueryWrapper<>();
+        wrapper.eq("workprocedure_id",query.getWorkprocedure_id());
+
+        Page<Map<String, Object>> page1 = deviceService.pageMaps(page.build(PdmBiDevice.class), wrapper);
+        String collect = page1.getRecords().stream().map(a->String.valueOf(a.get("device_code"))).collect(Collectors.joining("','"));
+        query.setDevice_code("('"+collect+"')");
+        List<Map> list = workorderService.qualityAnaByDevice(query);
+        if (!CollectionUtils.isEmpty(list)){
+            System.out.println("有数据了！！！！"+list.size());
+        }
+        Map<String, List<Map>> device_codeMap = list.stream().collect(Collectors.groupingBy(map -> String.valueOf(map.get("device_code"))));
+
+        //数据封装
+        List<Map<String,Object>> result = new ArrayList<>();
+        String time = query.getStart_time();
+        String mo =DatePattern.NORM_MONTH_FORMAT.format(DateUtil.parse(query.getStart_time()));
+        int minWeek = DateUtil.weekOfYear(DateUtil.parse(query.getStart_time()));
+        int minYear = DateUtil.year(DateUtil.parse(query.getStart_time()));
+        for (Map record : page1.getRecords()) {
+            Map<String, Object> item = new HashMap<>();
+            List<Map> maps = device_codeMap.get(record.get("device_code"));
+            item.put("device_code",record.get("device_code"));
+            item.put("device_name",record.get("device_name"));
+            item.put("product_area",record.get("product_area"));
+            Map<String, Map> collectByAnalysis = new HashMap<>();
+            if (!CollectionUtils.isEmpty(maps)){
+                collectByAnalysis = maps.stream().collect(HashMap::new, (k, v) -> k.put(String.valueOf(v.get(query.getAnalysis())), v), HashMap::putAll);
+            }else {
+                maps = new ArrayList<>();
+            }
+            String weektime = minYear+"_"+minWeek;
+            String motime = mo;
+            String datetime = time;
+            for (int i = 1; i <= between; i++) {
+                switch (query.getAnalysis()){
+                    case "1":
+                        Map itemData = collectByAnalysis.get(datetime);
+                        if (itemData==null){
+                            maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",datetime,"sort",i));
+                        }else {
+                            itemData.put("sort",i);
+                            itemData.put("header",datetime);
+                        }
+                        datetime = DatePattern.NORM_DATE_FORMAT.format(DateUtil.offset(DateUtil.parse(query.getStart_time()),DateField.DAY_OF_MONTH,i));
+                        break;
+                    case "2":
+                        Map weekData = collectByAnalysis.get(weektime);
+                        if (weekData==null){
+                            maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",weektime,"sort",i));
+                        }else {
+                            weekData.put("sort",i);
+                            weekData.put("header",weektime);
+                        }
+                        DateTime offset = DateUtil.offset(DateUtil.parse(query.getStart_time()), DateField.WEEK_OF_YEAR, i);
+                        weektime =  DateUtil.year(offset)+"_"+DateUtil.weekOfYear(offset);
+                        break;
+                    case "3":
+                        Map moDAta = collectByAnalysis.get(motime);
+                        if (moDAta==null){
+                            maps.add(MapOf.of("order_count", "0", "plan_qty", "0", "real_qty", "0", "nok_qty", "0","nok_rate",0,"header",motime,"sort",i));
+                        }else {
+                            moDAta.put("header",motime);
+                            moDAta.put("sort",i);
+                        }
+                        motime = DatePattern.NORM_MONTH_FORMAT.format(DateUtil.offset(DateUtil.parse(query.getStart_time()),DateField.MONTH,i));
+                        break;
+                    default:throw new BadRequestException("统计周期未定义");
+                }
+            }
+            maps.removeIf(map -> map.get("sort")==null);
+            maps.sort(Comparator.comparing(a->(int)a.get("sort")));
+            item.put("item",maps);
+            item.put("viewData",maps.stream().map(a->a.get("nok_rate")).collect(Collectors.toList()));
+            item.put("header",maps.stream().map(a->a.get("header")).collect(Collectors.toList()));
+            item.put("total_real_qty",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("real_qty")))).sum());
+            item.put("total_nok_qty",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("nok_qty")))).sum());
+            item.put("total_order_count",maps.stream().mapToLong(a->Long.valueOf(String.valueOf(a.get("order_count")))).sum());
+            result.add(item);
+        }
+        page1.setRecords(result);
+        System.out.println(list.size());
+        return new ResponseEntity<>(TableDataInfo.build(page1), HttpStatus.OK);
+    }
+
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/analysis_manage/qlmanage/dto/QualityQuery.java

@@ -19,6 +19,10 @@ public class QualityQuery {
      * 工序id
      */
     private String workprocedure_id;
+    /**
+     * 设备编号
+     */
+    private String device_code;
     /**
      * 车间
      */

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbBucketrecordService.java

@@ -39,5 +39,5 @@ public interface IMdPbBucketrecordService extends IService<MdPbBucketrecord> {
      */
     void excelImport(MultipartFile file, HttpServletRequest request, HttpServletResponse response);
 
-    List<Map> getMstList(String storagevehicle_code);
+    List<Map> getMstList(String storagevehicle_code,String sale_code);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/MdPbBucketrecordMapper.java

@@ -1,5 +1,6 @@
 package org.nl.wms.masterdata_manage.service.vehicle.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -18,5 +19,5 @@ public interface MdPbBucketrecordMapper extends BaseMapper<MdPbBucketrecord> {
 
     List<Map> queryAll(Map<String,Object> map);
 
-    List<Map> getMstList(String storagevehicle_code);
+    List<Map> getMstList(@Param("storagevehicle_code") String storagevehicle_code,@Param("sale_code") String sale_code);
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/dao/mapper/xml/MdPbBucketrecordMapper.xml

@@ -16,7 +16,7 @@
             and ma.material_id = #{material_id}
         </if>
         <if test="sale_code != null and sale_code != ''">
-            and re.sale_code like '${sale_code}%'
+            and re.sale_code like '%${sale_code}%'
         </if>
         <if test="storagevehicle_type != null and storagevehicle_type != ''">
             and re.storagevehicle_type = #{storagevehicle_type}
@@ -25,10 +25,10 @@
             and re.status = #{status}
         </if>
         <if test="storagevehicle_code != null and storagevehicle_code != ''">
-            and re.storagevehicle_code like '${storagevehicle_code}%'
+            and re.storagevehicle_code like '%${storagevehicle_code}%'
         </if>
         <if test="bucketunique != null and bucketunique != ''">
-            and ( re.bucketunique like '${bucketunique}%' )
+            and ( re.bucketunique like '%${bucketunique}%' )
         </if>
 
         order by re.create_time DESC
@@ -39,7 +39,10 @@
         from md_pb_bucketrecord,(select @rowcount := 0) as r
         where status = '1'
         <if test="storagevehicle_code != null and storagevehicle_code != ''">
-            and storagevehicle_code like '${storagevehicle_code}%'
+            and storagevehicle_code like '%${storagevehicle_code}%'
+        </if>
+        <if test="sale_code != null and sale_code != ''">
+            and sale_code like '%${sale_code}%'
         </if>
         GROUP BY storagevehicle_code,sale_code,create_time
     </select>

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java

@@ -278,7 +278,7 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl<MdPbBucketrecordMap
     }
 
     @Override
-    public List<Map> getMstList(String storagevehicle_code) {
+    public List<Map> getMstList(String storagevehicle_code,String sale_code) {
-       return this.baseMapper.getMstList(storagevehicle_code);
+       return this.baseMapper.getMstList(storagevehicle_code,sale_code);
     }
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java

@@ -92,13 +92,13 @@ public class PdaProductIosController {
     }
 
     @PostMapping("/bucket")
-    @Log("根据订单获取订单物料信息")
+    @Log("查询订单组盘记录")
     //("根据订单获取订单物料信息")
     public ResponseEntity<Object> bucket(@RequestBody JSONObject param) {
         String storagevehicleCode = param.getString("storagevehicle_code");
         List mstList= new ArrayList<>();
         if (param.getString("sale_code")!=null){
-            mstList = bucketrecordService.getMstList(storagevehicleCode);
+            mstList = bucketrecordService.getMstList(storagevehicleCode,param.getString("sale_code"));
         }else {
             List<Map<String, Object>> maps = bucketrecordService.listMaps(new QueryWrapper<MdPbBucketrecord>()
                     .eq("storagevehicle_code", storagevehicleCode).eq("status", "1"));

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/IPdmProduceWorkorderService.java

@@ -180,12 +180,19 @@ public interface IPdmProduceWorkorderService extends IService<PdmProduceWorkorde
      List<Map> productCap(ProductCapQuery query);
 
      /**
-      * 不合格品分析
+      * 车间质量统计分析
       * @param query
       * @return
       */
      List<Map> qualityAna(QualityQuery query);
 
+     /**
+      * 车间工序质量统计分析
+      * @param query
+      * @return
+      */
+     List<Map> qualityAnaByDevice(QualityQuery query);
+
      void download(Map map, HttpServletResponse response)
         throws IOException;
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.java

@@ -68,4 +68,6 @@ public interface PdmProduceWorkorderMapper extends BaseMapper<PdmProduceWorkorde
      */
     List<Map> qualityAnalysis(QualityQuery query);
 
+    List<Map> qualityAnalysisByDevice(QualityQuery query);
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml

@@ -379,6 +379,46 @@
             </otherwise>
         </choose>
     </select>
+    <select id="qualityAnalysisByDevice" resultType="java.util.Map">
+        select COUNT(pdm_produce_workorder.workprocedure_id) order_count,
+        pdm_produce_workorder.device_code,
+        pdm_produce_workorder.workprocedure_id,
+        YEAR(pdm_produce_workorder.create_time) '4',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m') '3',
+        CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time)) '2',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m-%d') '1',
+        sum(plan_qty) plan_qty,
+        SUM(real_qty) real_qty,
+        SUM(nok_qty) nok_qty,
+        IF( SUM(real_qty) > 0, sum( nok_qty )*100 / sum( real_qty ), 0 ) AS nok_rate
+        from pdm_produce_workorder
+        LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
+        where workorder_status in ('6','7') and pdm_produce_workorder.workprocedure_id = #{workprocedure_id}
+        <if test="device_code != null and device_code != ''">
+            and  pdm_produce_workorder.device_code in ${device_code}
+        </if>
+        <if test="start_time != null and start_time != ''">
+            and pdm_produce_workorder.create_time >= #{start_time}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and  pdm_produce_workorder.product_area >= #{product_area}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and  #{end_time} >= pdm_produce_workorder.create_time
+        </if>
+        GROUP BY pdm_produce_workorder.device_code
+        <choose>
+            <when test='analysis == "2"'>
+                ,CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time))
+            </when>
+            <when test='analysis == "3"'>
+                ,DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m')
+            </when>
+            <otherwise>
+                ,DATE(pdm_produce_workorder.create_time)
+            </otherwise>
+        </choose>
+    </select>
 
 </mapper>
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java

@@ -898,4 +898,10 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
           List<Map> maps = this.baseMapper.qualityAnalysis(query);
           return maps;
      }
+
+     @Override
+     public List<Map> qualityAnaByDevice(QualityQuery query) {
+          List<Map> maps = this.baseMapper.qualityAnalysisByDevice(query);
+          return maps;
+     }
 }

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -19,7 +19,7 @@ https://juejin.cn/post/6844903775631572999
     <!--引入默认的一些设置-->
 <!--    <include resource="log/AutoCreateInst.xml"/>-->
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://192.168.46.225:9200/_bulk</url>
+        <url>http://127.0.0.1:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>mes_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->
@@ -148,6 +148,7 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="dev3">
         <root level="debug">
             <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="esLogAppender"/>
         </root>
 
         <logger name="jdbc.audit" level="ERROR" additivity="false">

mes/qd/src/views/wms/analysis_manage/qlmanage/WorkprodureDevDialog.vue

@@ -0,0 +1,197 @@
+<template>
+  <el-dialog
+    title="工序设备"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="80%"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" disabled size="mini">
+        <el-form-item label="所属工序">
+          <el-input v-model="form.workprocedure_name" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="统计方式">
+          <el-input v-model="form.analysis" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="统计开始时间">
+          <el-input v-model="form.start_time" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="统计结束时间">
+          <el-input v-model="form.start_time" style="width: 120px;" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.search"
+          clearable
+          size="mini"
+          placeholder="编码、名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      :render-header="labelHead"
+      size="mini"
+      style="width: 100%;"
+      @selection-change="crud.selectionChangeHandler"
+    >
+      <el-table-column type="index" fixed width="80" label="序号" />
+      <el-table-column prop="device_name" fixed width="120" label="设备名称" />
+      <el-table-column prop="device_code" width="120" label="设备编号" />
+      <el-table-column prop="total_order_count" label="总工单数" width="100" />
+      <el-table-column prop="total_real_qty" label="总生产数" width="150" />
+      <el-table-column prop="total_nok_qty" label="总废品数" width="150" />
+      <el-table-column v-for="(item, index) in crud.data[0].header" :key="index" :label="item" align="center">
+        <el-table-column label="工单数" width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.item[index].order_count }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产数" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.item[index].real_qty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="废品数" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.item[index].nok_qty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="废品率%" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.item[index].nok_rate }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import qualityanilysis from '@/views/wms/analysis_manage/qlmanage/qualityanilysis'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'WorkprodureDevDialog',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({ title: '工序设备', url: '/api/qualityanalysis/bydevice', crudMethod: { ...qualityanilysis }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_area'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    workprocedureid: {
+      type: String
+    },
+    analysis: {
+      type: String
+    },
+    createtime: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: [],
+      form: {
+        analysis: null,
+        workprocedure_name: null,
+        start_time: null,
+        end_time: null
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    labelHead(h, { column, index }) { // 动态表头渲染
+      // let l = column.label.length;
+      // let f = 12; //每个字大小,其实是每个字的比例值,大概会比字体大小打差不多大
+      // column.minWidth = f * l; //字大小乘个数即长度 ,注意不要加px像素，这里minWidth只是一个比例值，不是真正的长度
+      // 然后将列标题放在一个div块中，注意块的宽度一定要100%，否则表格显示不完全
+      return h('span', { class: 'table-head', style: { width: '100%' }}, [column.label])
+    },
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    openQ(query) {
+      this.crud.query = query
+      console.log(query)
+      this.form.analysis = query.analysis
+      this.form.workprocedure_name = query.workprocedure_name
+      if (query.create_time != undefined && query.create_time != null) {
+        this.form.start_time = query.create_time[0]
+        this.form.end_time = query.create_time[1]
+      }
+      this.dialogVisible = true
+      this.crud.toQuery()
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        if (val.length > 1) {
+          this.$refs.table.clearSelection()
+          this.$refs.table.toggleRowSelection(val.pop())
+        } else {
+          this.checkrow = row
+        }
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.dialogVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

mes/qd/src/views/wms/analysis_manage/qlmanage/index.vue

@@ -48,9 +48,9 @@
           </el-form-item>
           <el-form-item label="统计类型">
             <el-radio-group v-model="query.analysis" size="small" @change="crud.toQuery">
-            <el-radio label="1">日</el-radio>
+              <el-radio label="1">日</el-radio>
-            <el-radio label="2">周</el-radio>
+              <el-radio label="2">周</el-radio>
-            <el-radio label="3">月</el-radio>
+              <el-radio label="3">月</el-radio>
             </el-radio-group>
           </el-form-item>
           <rrOperation />
@@ -58,16 +58,16 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-<!--        <el-button-->
+        <!--        <el-button-->
-<!--          slot="right"-->
+        <!--          slot="right"-->
-<!--          class="filter-item"-->
+        <!--          class="filter-item"-->
-<!--          type="warning"-->
+        <!--          type="warning"-->
-<!--          icon="el-icon-check"-->
+        <!--          icon="el-icon-check"-->
-<!--          size="mini"-->
+        <!--          size="mini"-->
-<!--          @click="sync"-->
+        <!--          @click="sync"-->
-<!--        >-->
+        <!--        >-->
-<!--          同步-->
+        <!--          同步-->
-<!--        </el-button>-->
+        <!--        </el-button>-->
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -79,49 +79,54 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="index" width="80" label="序号"/>
+        <el-table-column type="index" fixed width="80" label="序号" />
         <el-table-column prop="product_area" width="120" label="所属车间">
           <template slot-scope="scope">
             {{ dict.label.product_area[scope.row.product_area] }}
           </template>
         </el-table-column>
-        <el-table-column prop="workprocedure_code" label="工序编号" width="120" show-overflow-tooltip />
+        <el-table-column prop="workprocedure_code" fixed label="工序编号" width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="bydevice(scope.$index, scope.row)">{{ scope.row.workprocedure_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="workprocedure_name" label="工序名称" width="150" />
         <el-table-column prop="total_order_count" label="总工单数" width="100" />
         <el-table-column prop="total_real_qty" label="总生产数" width="150" />
         <el-table-column prop="total_nok_qty" label="总废品数" width="150" />
-        <el-table-column :label="item" v-for="(item, index) in crud.data[0].header" :key="index"  align="center">
+        <el-table-column v-for="(item, index) in crud.data[0].header" :key="index" :label="item" align="center">
-          <el-table-column  label="工单数" width="60" >
+          <el-table-column label="工单数" width="60">
             <template slot-scope="scope">
               <span>{{ scope.row.item[index].order_count }}</span>
             </template>
           </el-table-column>
-          <el-table-column  label="生产数" width="120" >
+          <el-table-column label="生产数" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.item[index].real_qty }}</span>
             </template>
           </el-table-column>
-          <el-table-column  label="废品数" width="120" >
+          <el-table-column label="废品数" width="120">
             <template slot-scope="scope">
               <span>{{ scope.row.item[index].nok_qty }}</span>
             </template>
           </el-table-column>
-          <el-table-column  label="废品率%" width="120" >
+          <el-table-column label="废品率%" width="120">
             <template slot-scope="scope">
-              <span>{{ scope.row.item[index].nok_rate}}</span>
+              <span>{{ scope.row.item[index].nok_rate }}</span>
             </template>
           </el-table-column>
         </el-table-column>
       </el-table>
       <!--分页组件-->
       <pagination />
+      <WorkprodureDevDialog ref="WorkprodureDevDialog" :dialog-show.sync="workproduceShow" />
     </div>
-    <div id="main2" style="width: 100%;height:350px;"></div>
+    <div id="main2" style="width: 100%;height:350px;" />
-
   </div>
 </template>
 
 <script>
+import WorkprodureDevDialog from '@/views/wms/analysis_manage/qlmanage/WorkprodureDevDialog'
 import qualityanilysis from '@/views/wms/analysis_manage/qlmanage/qualityanilysis'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
@@ -133,12 +138,12 @@ import echarts from 'echarts'
 
 const defaultForm = {
   analysis: '1',
-  product_area : 'A1',
+  product_area: 'A1'
 }
 export default {
   name: 'WorkGood',
   dicts: ['product_area'],
-  components: { pagination, crudOperation, rrOperation },
+  components: { WorkprodureDevDialog, pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -164,10 +169,13 @@ export default {
       }
     }
     return {
+      workproduceShow: false,
+      nowrow: {},
+      nowindex: '',
       measure_unit: [],
       sects: [],
       workList: [],
-      headerData:[],
+      headerData: [],
       product_area: 'A1',
       downloadLoading: false,
       permission: {
@@ -184,33 +192,34 @@ export default {
     this.query.analysis = '1'
   },
   methods: {
-    labelHead(h,{column,index}){ //动态表头渲染
+    labelHead(h, { column, index }) { // 动态表头渲染
-      //let l = column.label.length;
+      // let l = column.label.length;
-      //let f = 12; //每个字大小,其实是每个字的比例值,大概会比字体大小打差不多大
+      // let f = 12; //每个字大小,其实是每个字的比例值,大概会比字体大小打差不多大
-      //column.minWidth = f * l; //字大小乘个数即长度 ,注意不要加px像素，这里minWidth只是一个比例值，不是真正的长度
+      // column.minWidth = f * l; //字大小乘个数即长度 ,注意不要加px像素，这里minWidth只是一个比例值，不是真正的长度
-      //然后将列标题放在一个div块中，注意块的宽度一定要100%，否则表格显示不完全
+      // 然后将列标题放在一个div块中，注意块的宽度一定要100%，否则表格显示不完全
-      return h('span',{class:'table-head',style:{width:'100%'}},[column.label])
+      return h('span', { class: 'table-head', style: { width: '100%' }}, [column.label])
-    },
-    sync() {
-      dailyStructivt.sync(Array.of('st_ivt_structivt_bcp', 'st_ivt_structivt_cp', 'st_ivt_structivt_yl')).then(result => {
-        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => { })
     },
     getWorkprocedure() { // 获取工序下拉框
       crudDevice.getWorkprocedure().then(res => {
         this.workList = res
       })
     },
+    bydevice(index, row) {
+      this.workproduceShow = true
+      this.crud.query.workprocedure_id = row.workprocedure_id
+      this.crud.query.workprocedure_name = row.workprocedure_name
+      this.$refs.WorkprodureDevDialog.openQ(this.crud.query)
+    },
     [CRUD.HOOK.afterRefresh]() {
-      var legendData =[]
+      var legendData = []
-      var xAxisData =this.crud.data[0].header
+      var xAxisData = this.crud.data[0].header
-      var seriesData =[]
+      var seriesData = []
-      this.crud.data.forEach(a=>{
+      this.crud.data.forEach(a => {
-        legendData.push(a.workprocedure_name);
+        legendData.push(a.workprocedure_name)
-        seriesData.push({"data":a.viewData,"name":a.workprocedure_name, "type": 'line',"stack": a.workprocedure_name})
+        seriesData.push({ 'data': a.viewData, 'name': a.workprocedure_name, 'type': 'line', 'stack': a.workprocedure_name })
-        }
+      }
       )
-      var myChart = echarts.init(document.getElementById('main2'));
+      var myChart = echarts.init(document.getElementById('main2'))
       var option = {
         title: {
           text: '工序废品率'
@@ -238,11 +247,11 @@ export default {
           data: xAxisData
         },
         yAxis: {
-          type: 'value',
+          type: 'value'
         },
         series: seriesData
-      };
+      }
-      myChart.setOption(option);
+      myChart.setOption(option)
     },
     downloadMethod() {
       this.beforeInit()

mes/qd/src/views/wms/analysis_manage/qlmanage/qualityanilysis.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import qs from 'qs'
 
 export function add(data) {
   return request({
@@ -16,6 +17,12 @@ export function del(ids) {
   })
 }
 
+export function bydevice(param) {
+  return request({
+    url: 'api/qualityanalysis/bydevice' + '?' + qs.stringify(param, { indices: false }),
+    method: 'get'
+  })
+}
 
 export function edit(data) {
   return request({
@@ -24,4 +31,4 @@ export function edit(data) {
     data
   })
 }
-export default { add, edit, del }
+export default { add, edit, del, bydevice }

mes/qd/src/views/wms/analysis_manage/workProgress/index.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script>
-import dailyStructivt from '@/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt'
+import qualityanilysis from '@/views/wms/analysis_manage/qlmanage/qualityanilysis'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'