north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -800,7 +800,7 @@ let process = titleUploadData.value.thisProcess let laminating = titleUploadData.value.laminating equalByOrderNum.forEach((row) =>{ if (laminating == 'laminating'){ if (laminating != ''){ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity } }) @@ -1243,7 +1243,7 @@ let laminating = titleUploadData.value.laminating if (column.property==='completedQuantity') { xGrid.value.getTableData().fullData.forEach((item, index) =>{ if(item.order_number===row.order_number && laminating == 'laminating'){ if(item.order_number===row.order_number && laminating != ''){ item.completedQuantity=row.completedQuantity } }) @@ -1257,7 +1257,7 @@ const arr = xGrid.value.getTableData().fullData //根据是否合片工序过滤 const returnArr = laminating === "laminating" laminating != "" ? arr.filter((obj, index, self) => self.findIndex((t) => t.order_number === obj.order_number) === index ) north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -404,7 +404,7 @@ //获取报工工序是否为复合工程 String laminating = reportingWorkMapper.getProcessLaminating(thisProcess); //合片工序 if (laminating.equals("laminating")){ if (laminating.equals("stepA") || laminating.equals("stepB")){ LambdaUpdateWrapper <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1339,7 +1339,7 @@ rw.examine_time, -- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName CASE WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+') WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+') ELSE MAX( ogd.glass_child ) END AS workProcessName FROM @@ -1369,7 +1369,7 @@ </if> <choose> <when test="laminating != 'laminating'"> <when test="laminating == ''"> GROUP BY rw.reporting_work_id, rw.process_id, @@ -1482,7 +1482,7 @@ </if> <choose> <when test="laminating != 'laminating'"> <when test="laminating == ''"> GROUP BY rw.reporting_work_id, rw.process_id, @@ -2097,7 +2097,7 @@ and od.edging_type regexp #{teamOutputDTO.edgingType} </if> <choose> <when test="laminating != 'laminating'"> <when test="laminating == ''"> GROUP BY rw.reporting_work_id, rw.process_id, north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -215,7 +215,7 @@ LEFT JOIN sd.order_glass_detail AS ogd ON od.order_id = ogd.order_id AND od.order_number = ogd.order_number <if test="process == '夹胶' or (process == '打胶和粘框')" > <if test="laminating == 'stepA'" > AND ogd.`group` = (select `group` from sd.order_glass_detail where order_id = ogd.order_id @@ -258,7 +258,7 @@ 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 process_id= #{processIdStr} and a.reviewed_state>=0 <if test="laminating != 'laminating'"> <if test="laminating == ''"> AND POSITION(b.technology_number in #{technologyStr}) </if> GROUP BY b.order_number,b.technology_number @@ -268,7 +268,7 @@ fc.process_id = #{processIdStr} AND odpd.process = #{process} <if test="laminating != 'laminating'"> <if test="laminating == ''"> AND POSITION(fc.technology_number in #{technologyStr}) </if> order by fc.order_number @@ -952,7 +952,7 @@ LEFT JOIN sd.order_glass_detail AS ogd ON od.order_id = ogd.order_id AND od.order_number = ogd.order_number <if test="process == '夹胶' or (process == '打胶和粘框')"> <if test="laminating == 'stepA'" > AND ogd.`group` = (select `group` from sd.order_glass_detail where order_id = ogd.order_id @@ -1002,7 +1002,7 @@ on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number WHERE fc.process_id = #{processIdStr} <if test="laminating != 'laminating' "> <if test="laminating == ''"> AND POSITION(fc.technology_number in #{technologyStr}) </if> AND odpd.process = #{process}
