廖井涛
2024-07-18 7439e7de1b827e986aa03f9650ab8ca6b9ca51c7
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
2个文件已修改
18 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -412,7 +412,6 @@
          //根据补片状态判断是否能修改
          request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
            if (res.code == 200) {
              console.log(res.data)
              if (res.data > 0) {
                ElMessage.error("该报工包含已补片数据,不可修改!")
                return
@@ -584,7 +583,7 @@
    },
    {
      field: 'responsiblePersonnel',
      title: t('reportingWorks.responsiblePersonnel'),
      title: '责任信息',
      editRender: {name: 'input', attrs: {placeholder: ''}}
    },
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -591,7 +591,12 @@
    </select>
<!--    查询下工序是否报工-->
    <select id="selectCountByProcessId">
        select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
        select count(reporting_work_id)
        from reporting_work
        where
            this_process=#{nextProcess}
            and process_id=#{processId}
            and reviewed_state>-1
    </select>
<!--    查询完工次破数量-->
@@ -600,12 +605,10 @@
               rwd.order_number,
               rwd.technology_number,
               rwd.completed_quantity,
               IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
               rwd.breakage_quantity as breakage_quantity
        from reporting_work as rw
                 left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
                 left join damage_details as dd
                           on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
                              dd.technology_number = rwd.technology_number
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
        where rw.reporting_work_id = #{reportingWorkId}
        GROUP BY rwd.order_number, rwd.technology_number
    </select>