更新

chenlu

2024-08-12 baca9c7182b69b39ec88ed69cbf3e0fbd8fb01e7

更新

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

@@ -533,7 +533,6 @@
                }

              })
              console.log(dataList)
            }
          }
          break
@@ -1030,7 +1029,6 @@
  let technologyStr = result[2];

  let reportType= company.reportType
  console.log(reportType)
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
    if (res.code == 200) {
      if(res.data.data==null){

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

@@ -662,7 +662,7 @@
            and fcs.process=#{process}
        where fc.process_id = #{processId}
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number,fc.technology_number
        group by fc.process_id, fc.order_number
        order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
    </select>