报工审核通过修改，次破数量列添加颜色

chenlu

2024-07-16 399a1653dd32e2c70945b2e9e47485e1b6cf976d

报工审核通过修改，次破数量列添加颜色

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

@@ -910,7 +910,8 @@
  }
  const reportWork = {
    process: titleUploadData.value.previousProcess,
    processId:processId
    processId:processId,
    thisProcess:titleUploadData.value.thisProcess
  }
  loadingFlag.value= true
  request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -1125,7 +1126,7 @@
}
onMounted(() => {
  window.addEventListener('keypress', qrcodeScanner);
  addListener(xGrid.value, gridOptions)
 // addListener(xGrid.value, gridOptions)
})

// 在组件卸载时移除键盘事件监听
@@ -1175,6 +1176,14 @@
    nextTime = ''
    lastCode = ''
    nextCode = ''
  }

}


const cellClassName = ({ row, column }) => {
  if (column.field === 'breakageQuantity') {
      return 'col-red'
  }

}
@@ -1353,6 +1362,7 @@
          v-bind="gridOptions"
          v-on="gridEvents"
          @edit-closed="editClosedEvent"
          :cell-class-name="cellClassName"

      >

@@ -1545,4 +1555,9 @@
  user-select: none;
}

::v-deep(.mytable-scrollbar .col-red) {
  background-color: rgb(66,159,254);
  color: #fff;
}

</style>

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

@@ -76,4 +76,6 @@
    List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);

    Integer selectLayerByReportingWorkId(String reportingWorkId);

    Boolean ReviewReportingWorkMp(String substring, String process, String result);
}

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

@@ -287,8 +287,12 @@
    public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) {

        String processId = reportingWork.get("processId");
        String thisProcess = reportingWork.get("thisProcess");
        int index = processId.lastIndexOf("/") + 1;
        String result = processId.substring(index);

        LambdaUpdateWrapper
if (thisProcess.equals("夹胶") || thisProcess.equals("中空") || thisProcess.equals("仓储")){
    LambdaUpdateWrapper
                <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper
                .eq(ReportingWork::getProcessId, processId.substring(0, 14))
@@ -296,8 +300,10 @@
                .eq(ReportingWork::getReviewedState, 0)
                .setSql("reviewed_state =1");
        reportingWorkMapper.update(null, updateWrapper);
}else {
    reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),result);


}
        return true;
    }


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

@@ -78,11 +78,13 @@
               ifnull((rw.reviewed_state),1) as reviewed_state  -- 下工序审核状态
        from sd.order as o
        left join flow_card as fc on fc.order_id = o.order_id
        left join (select if(count(reviewed_state)>0 and process_id=null,1,0) as reviewed_state ,
                          process_id
                   from reporting_work
                   where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}) as rw
        left join (select reviewed_state as reviewed_state ,
                          process_id,a.reporting_work_id
                   from reporting_work as a
                       left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
                   where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr} and b.technology_number=#{technologyStr}) as rw
        on rw.process_id = fc.process_id
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
        where fc.process_id = #{processIdStr}
          and fc.technology_number = #{technologyStr}
        GROUP BY fc.process_id
@@ -749,4 +751,12 @@
        select  REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
        where rwd.reporting_work_id=#{reportingWorkId}
    </select>

    <update id="ReviewReportingWorkMp">
        update reporting_work as rw
            left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
        set rw.reviewed_state = 1
        where rw.process_id = #{substring} and rw.this_process=#{process}
          and rwd.technology_number = #{result} and reviewed_state=0
    </update>
</mapper>