返工查询后端筛选提交

廖井涛

2024-09-13 95270d9f2d0c93b52569268737902c4f09216c6b

返工查询后端筛选提交

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -57,7 +57,6 @@
request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data)
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal

@@ -93,7 +92,6 @@
  request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal


 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -7,7 +7,6 @@
import deepClone from "@/utils/deepClone";
import {Search} from "@element-plus/icons-vue";
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent,filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

@@ -83,6 +82,43 @@
  }
})

const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}
function filterChanged(column){
  gridOptions.loading=true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.')>-1){
    const  columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]:value
    }
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/rework/SelectRework/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal

      selectDate.value = res.data.selectDate
      pageNum.value=1

      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
      router.push("/login")
    }
  })
}


//子组件接收参数
const xGrid = ref()
@@ -104,7 +140,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
   // remote: true
    remote: true
  },
  customConfig: {
    storage: true
@@ -118,33 +154,33 @@
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'review_status',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
    {field: 'rework_id', width: 120, title: t('rework.reworkNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_team', width: 120, title: t('rework.reworkTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_id', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'process_id', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_sort', width: 80, title: t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'technology_number', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_type', width: 100, title: t('rework.reworkType'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_reason', width: 120, title: t('rework.reasonForRework'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_equipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_team', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_processes', width: 120, title: t('rework.reworkProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glass_address', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_num', width: 80, title: t('productStock.reworkQuantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'rework_area', width: 120, title: t('rework.reworkArea'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'quality_inspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'create_time', width: 100, title: t('productStock.productionDate')},
    {field: 'update_time', width: 120, title: t('productStock.approvedDate')},
    {field: 'product_name', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reporting_work_id', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reviewStatus',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
    {field: 'reworkId', width: 120, title: t('rework.reworkNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkTeam', width: 120, title: t('rework.reworkTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'orderId', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'processId', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber')},
    {field: 'orderSort', width: 80, title: t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'technologyNumber', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkType', width: 100, title: t('rework.reworkType'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkReason', width: 120, title: t('rework.reasonForRework'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkProcesses', width: 120, title: t('rework.reworkProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkNum', width: 80, title: t('productStock.reworkQuantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reworkArea', width: 120, title: t('rework.reworkArea'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'qualityInspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'createTime', width: 100, title: t('productStock.productionDate')},
    {field: 'updateTime', width: 120, title: t('productStock.approvedDate')},
    {field: 'productName', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reportingWorkId', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'}},

  ],//表头按钮

@@ -321,6 +357,7 @@


    <vxe-grid
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java

@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
@@ -39,7 +40,7 @@
    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("SelectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }


 north-glass-erp/src/main/java/com/example/erp/dto/pp/ReworkDTO.java

New file
@@ -0,0 +1,46 @@
package com.example.erp.dto.pp;

import lombok.Data;

import java.time.LocalDate;

@Data
public class ReworkDTO {
    private Long id;
    private String reworkTeam;
    private String orderId;
    private Integer reviewStatus;
    private String reportingWorkId;
    private String reworkId;
    private String processId;
    private Integer orderSort;
    private String project;
    private String batch;
    private String buildingNumber;
    private String productName;
    private Integer technologyNumber;
    private String glassAddress;
    private Integer reworkNum;
    private Double width;
    private Double height;
    private String shape;
    private String reworkType;
    private String reworkReason;
    private String responsibleTeam;
    private String responsiblePersonnel;
    private String responsibleEquipment;
    private String reworkArea;
    private String qualityInspector;
    private String reworkProcesses;
    private String reviewer;
    private LocalDate createTime;
    private LocalDate updateTime;
    private String glassNumber;







}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReworkMapper.java

@@ -1,5 +1,6 @@
package com.example.erp.mapper.pp;

import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWorkDetail;
@@ -13,9 +14,11 @@
@Mapper
public interface ReworkMapper {

    List<Map<String,Object>> SelectRework(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,Rework rework);
    List<ReworkDTO> SelectRework(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
                                          String startDate, String endDate,@Param("rework") ReworkDTO rework);

    Map<String,Integer> SelectReworkPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,Rework rework);
    Map<String,Integer> SelectReworkPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,
                                              String startDate,String endDate,@Param("rework") ReworkDTO rework);

    List<Map<String,Object>> getSelectRework(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);


 north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.dto.pp.ReworkDTO;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
@@ -71,7 +72,7 @@
        return listMap;
    }

    public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, Rework rework) {
    public Map<String, Object> SelectRework(Integer pageNum, Integer pageSize, List<String> selectDate, ReworkDTO rework) {
        Integer offset = (pageNum - 1) * pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();

 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml

@@ -47,6 +47,84 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
            <if test="rework.reworkId != null and rework.reworkId != ''">
                and r.rework_id regexp #{rework.reworkId}
            </if>
            <if test="rework.reworkTeam != null and rework.reworkTeam != ''">
                and r.rework_team regexp #{rework.reworkTeam}
            </if>
            <if test="rework.orderId != null and rework.orderId != ''">
                and r.order_id regexp #{rework.orderId}
            </if>
            <if test="rework.reportingWorkId != null and rework.reportingWorkId != ''">
                and r.reporting_work_id regexp #{rework.reportingWorkId}
            </if>
            <if test="rework.processId != null and rework.processId != ''">
                and r.process_id regexp #{rework.processId}
            </if>
            <if test="rework.project != null and rework.project != ''">
                and o.project regexp #{rework.project}
            </if>
            <if test="rework.batch != null and rework.batch != ''">
                and o.batch regexp #{rework.batch}
            </if>
            <if test="rework.orderSort != null and rework.orderSort != ''">
                and r.order_sort regexp #{rework.orderSort}
            </if>
            <if test="rework.buildingNumber != null and rework.buildingNumber != ''">
                and od.building_number regexp #{rework.buildingNumber}
            </if>
            <if test="rework.productName != null and rework.productName != ''">
                and od.product_name regexp #{rework.productName}
            </if>
            <if test="rework.technologyNumber != null and rework.technologyNumber != ''">
                and r.technology_number regexp #{rework.technologyNumber}
            </if>
            <if test="rework.qualityInspector != null and rework.qualityInspector != ''">
                and r.quality_inspector regexp #{rework.qualityInspector}
            </if>
            <if test="rework.width != null and rework.width != ''">
                and od.width regexp #{rework.width}
            </if>
            <if test="rework.height != null and rework.height != ''">
                and od.height regexp #{rework.height}
            </if>
            <if test="rework.shape != null and rework.shape != ''">
                and od.shape regexp #{rework.shape}
            </if>
            <if test="rework.reworkNum != null and rework.reworkNum != ''">
                and r.rework_num regexp #{rework.reworkNum}
            </if>
            <if test="rework.glassAddress != null and rework.glassAddress != ''">
                and ogd.glass_address regexp #{rework.glassAddress}
            </if>
            <if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
                and r.responsible_team regexp #{rework.responsibleTeam}
            </if>
            <if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
                and r.responsible_equipment regexp #{rework.responsibleEquipment}
            </if>
            <if test="rework.responsiblePersonnel != null and rework.responsiblePersonnel != ''">
                and r.responsible_personnel regexp #{rework.responsiblePersonnel}
            </if>
            <if test="rework.reworkType != null and rework.reworkType != ''">
                and r.rework_type regexp #{rework.reworkType}
            </if>
            <if test="rework.reworkReason != null and rework.reworkReason != ''">
                and r.rework_reason regexp #{rework.reworkReason}
            </if>
            <if test="rework.reworkArea != null and rework.reworkArea != ''">
                and r.rework_area regexp #{rework.reworkArea}
            </if>
            <if test="rework.qualityInspector != null and rework.qualityInspector != ''">
                and r.quality_inspector regexp #{rework.qualityInspector}
            </if>
            <if test="rework.reworkProcesses != null and rework.reworkProcesses != ''">
                and r.rework_processes regexp #{rework.reworkProcesses}
            </if>
            <if test="rework.reviewer != null and rework.reviewer != ''">
                and r.reviewer regexp #{rework.reviewer}
            </if>
        </where>
         order by r.review_status,r.id desc limit #{offset},#{pageSize};
    </select>
@@ -63,6 +141,84 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
            <if test="rework.reworkId != null and rework.reworkId != ''">
                and r.rework_id regexp #{rework.reworkId}
            </if>
            <if test="rework.reworkTeam != null and rework.reworkTeam != ''">
                and r.rework_team regexp #{rework.reworkTeam}
            </if>
            <if test="rework.orderId != null and rework.orderId != ''">
                and r.order_id regexp #{rework.orderId}
            </if>
            <if test="rework.reportingWorkId != null and rework.reportingWorkId != ''">
                and r.reporting_work_id regexp #{rework.reportingWorkId}
            </if>
            <if test="rework.processId != null and rework.processId != ''">
                and r.process_id regexp #{rework.processId}
            </if>
            <if test="rework.project != null and rework.project != ''">
                and o.project regexp #{rework.project}
            </if>
            <if test="rework.batch != null and rework.batch != ''">
                and o.batch regexp #{rework.batch}
            </if>
            <if test="rework.orderSort != null and rework.orderSort != ''">
                and r.order_sort regexp #{rework.orderSort}
            </if>
            <if test="rework.buildingNumber != null and rework.buildingNumber != ''">
                and od.building_number regexp #{rework.buildingNumber}
            </if>
            <if test="rework.productName != null and rework.productName != ''">
                and od.product_name regexp #{rework.productName}
            </if>
            <if test="rework.technologyNumber != null and rework.technologyNumber != ''">
                and r.technology_number regexp #{rework.technologyNumber}
            </if>
            <if test="rework.qualityInspector != null and rework.qualityInspector != ''">
                and r.quality_inspector regexp #{rework.qualityInspector}
            </if>
            <if test="rework.width != null and rework.width != ''">
                and od.width regexp #{rework.width}
            </if>
            <if test="rework.height != null and rework.height != ''">
                and od.height regexp #{rework.height}
            </if>
            <if test="rework.shape != null and rework.shape != ''">
                and od.shape regexp #{rework.shape}
            </if>
            <if test="rework.reworkNum != null and rework.reworkNum != ''">
                and r.rework_num regexp #{rework.reworkNum}
            </if>
            <if test="rework.glassAddress != null and rework.glassAddress != ''">
                and ogd.glass_address regexp #{rework.glassAddress}
            </if>
            <if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
                and r.responsible_team regexp #{rework.responsibleTeam}
            </if>
            <if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
                and r.responsible_equipment regexp #{rework.responsibleEquipment}
            </if>
            <if test="rework.responsiblePersonnel != null and rework.responsiblePersonnel != ''">
                and r.responsible_personnel regexp #{rework.responsiblePersonnel}
            </if>
            <if test="rework.reworkType != null and rework.reworkType != ''">
                and r.rework_type regexp #{rework.reworkType}
            </if>
            <if test="rework.reworkReason != null and rework.reworkReason != ''">
                and r.rework_reason regexp #{rework.reworkReason}
            </if>
            <if test="rework.reworkArea != null and rework.reworkArea != ''">
                and r.rework_area regexp #{rework.reworkArea}
            </if>
            <if test="rework.qualityInspector != null and rework.qualityInspector != ''">
                and r.quality_inspector regexp #{rework.qualityInspector}
            </if>
            <if test="rework.reworkProcesses != null and rework.reworkProcesses != ''">
                and r.rework_processes regexp #{rework.reworkProcesses}
            </if>
            <if test="rework.reviewer != null and rework.reviewer != ''">
                and r.reviewer regexp #{rework.reviewer}
            </if>
        </where>
              ) as zu
        limit #{offset},#{pageSize};