添加实体类注解，添加报工新增界面右键次破相同功能，部分查询修改为订单作废后不能查询

chenlu

2024-08-27 c66da2daf6da0441eb64e54c2d40f49fb6c2f4de

添加实体类注解，添加报工新增界面右键次破相同功能，部分查询修改为订单作废后不能查询

 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -33,7 +33,7 @@
  alType:'order.alType',
  customerBatch:'order.customerBatch',
  processingNote:'order.processingNote',
  remarks:'产品备注',
  remarks:'订单备注',
  customerAbbreviation:'customer.customerAbbreviation',
  productAbbreviation:'product.msg.productAbbreviation',
  processId:'processCard.processId',
@@ -49,7 +49,7 @@
  remarks2:'备注2',
  remarks3:'备注3',
  remarks4:'备注4',
  filmNumber:'膜号',
  filmNumber:'产品备注',
  bendRadius:'order.bendRadius',
  glassChild:'reportingWorks.glassChild',
  glassAddress:'replenish.sliceMarking'

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -500,9 +500,11 @@
          <el-button type="warning" @click="clear">清空</el-button>
        </el-col>
        <el-col :span="1">
<!--          <el-button type="danger" @click="htmlPrint">打印</el-button>-->
          <el-button :disabled="!tag.id" type="danger" @click="deleteTag">删除</el-button>
        </el-col>
        <el-col :span="1">
          <el-button type="danger" @click="htmlPrint">打印</el-button>
        </el-col>
      </el-row>



 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -239,7 +239,14 @@
          },
          {
            code: 'SecondaryBreakage',
            name: "次破相同",
            name: "序号次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'checkedBreakage',
            name: "选中次破相同",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
@@ -510,7 +517,7 @@
        }
        case 'SecondaryBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity"){
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const seenOrders = {}
@@ -537,6 +544,27 @@
          }
          break
        }
        case 'checkedBreakage' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              const val = dataList[result.start].damageDetails
              const quantity = dataList[result.start].breakageQuantity
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item.damageDetails = val
                  item.breakageQuantity =  quantity
                  if (index!=result.start){
                    item.completedQuantity = item.completedQuantity - quantity
                  }

                }
              })
            }
          }
          break
        }
      }
    }
  },

 north-glass-erp/src/main/java/com/example/erp/entity/pp/PatchLog.java

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

import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;

import java.time.LocalDate;
@@ -43,5 +44,6 @@
    private String reportingWorkId;

    //外键流程卡表
    @TableField(select = false,exist = false)
    private FlowCard flowCard;
}

 north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -45,9 +46,12 @@
    private  String reviewer;

    //外键订单表
    @TableField(select = false,exist= false)
    private Order order;
    //外键订单明细表
    @TableField(select = false,exist= false)
    private OrderDetail orderDetail;
    //外键订单明细表
    @TableField(select = false,exist= false)
    private OrderGlassDetail orderGlassDetail;
}

 north-glass-erp/src/main/java/com/example/erp/entity/pp/Rework.java

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

import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;

import java.time.LocalDate;
@@ -42,5 +43,6 @@
    private String reportingWorkId;

    //外键流程卡表
    @TableField(select = false,exist= false)
    private FlowCard flowCard;
}

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

@@ -46,6 +46,7 @@
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
@@ -156,6 +157,7 @@
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
          and o.create_order>0
        order by dd.id desc
    </select>


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

@@ -77,6 +77,7 @@
        left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number and
        ogd.technology_number=ps.technology_number
        where ps.scheduling_id IS NOT NULL
          and o.create_order>0
        and od.create_time between #{selectTime1} and #{selectTime2}
        and position(#{processes} in ps.processes)
        and position(#{orderIds} in ps.order_id)
@@ -140,7 +141,7 @@
        where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
        and od.create_time between #{selectTime1} and #{selectTime2}
        and opd.reporting_work_num_count = 0

        and o.create_order>0
        and position(#{orderIds} in ogd.order_id)
        -- and position("切割" in ps.processes)
        <if test="productionScheduling.order.orderId != null and productionScheduling.order.orderId != ''">
@@ -236,7 +237,7 @@
        where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0
        and od.create_time between #{selectTime1} and #{selectTime2}
        and opd.reporting_work_num_count = 0

        and o.create_order>0
        and position(#{orderId} in ogd.order_id)
        -- and position("切割" in ps.processes)
        <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">
@@ -269,6 +270,7 @@
        ogd.technology_number=ps.technology_number
        where ps.scheduling_id IS NOT NULL
        and od.create_time between #{selectTime1} and #{selectTime2}
        and o.create_order>0
        and position(#{processes} in ps.processes)
        and position(#{orderId} in ps.order_id)
        <if test="productionScheduling.orderId != null and productionScheduling.orderId != ''">

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

@@ -110,7 +110,9 @@
    <select id="SelectTechnologicalProcess">
        select ifnull((select ogd.process
                       from sd.order_glass_detail as ogd
                       left join sd.`order` as o on o.order_id=ogd.order_id
                       where ogd.production_id = LEFT(#{processIdStr}, 11)
                         and o.create_order>0
                         and POSITION(ogd.technology_number in #{technologyStr})
                       limit 1),'') as  process

@@ -528,6 +530,7 @@
          and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
          and position(#{orderId} in rw.order_id)
          and rw.reviewed_state!=-1
          and o.create_order>0
        <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
            and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
        </if>
@@ -569,6 +572,7 @@
        where rw.reviewed_state != 2
          and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
          and rw.reviewed_state!=-1
          and o.create_order>0
        <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
            and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
        </if>

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

@@ -46,6 +46,7 @@
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
         order by r.review_status,r.id desc limit #{offset},#{pageSize};
    </select>
@@ -61,6 +62,7 @@
                                 on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
              ) as zu
        limit #{offset},#{pageSize};
@@ -100,7 +102,7 @@
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc
    </select>



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

@@ -95,7 +95,7 @@
        left join `order` as o
        on o.order_id=ogd.order_id
        where ogd.production_id IS NOT NULL

        and o.order_review>0
        <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
            and o.order_id regexp #{orderGlassDetail.orderId}
        </if>