ERP_override.git

parent: 69b74615 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2025-05-13 1513b84f9d700f54c4caa28fb553ddb9aea21eb4

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

8个文件已修改

	north-glass-erp/northglass-erp/src/lang/ar.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/lang/en.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/lang/ru.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/lang/zh.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -897,7 +897,8 @@
        selectFile:'حدد الملف',
        msg3:'يمكن تحميل ملفات jpg/png فقط ويجب ألا يتجاوز حجمها 5 ميغابايت',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
        laminatingProcessA:'合片A',
        laminatingProcessB:'合片B',
    },
    machine:{
        page:{

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -897,7 +897,8 @@
        selectFile:'Selecting file',
        msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
        laminatingProcessA:'合片A',
        laminatingProcessB:'合片B',
    },
    machine:{
        page:{

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -896,7 +896,8 @@
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
        laminatingProcessA:'合片A',
        laminatingProcessB:'合片B',
    },
    machine:{
        page:{

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -907,7 +907,8 @@
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
        laminatingProcessA:'合片A',
        laminatingProcessB:'合片B',
    },
    machine:{
        page:{

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -225,7 +225,8 @@
        <el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
        <el-select v-model="basic.nickname" v-else>
          <el-option  :label="$t('orderBasicData.commonProcess')" value="" />
          <el-option  :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
          <el-option  :label="$t('orderBasicData.laminatingProcessA')" value="stepA" />
          <el-option  :label="$t('orderBasicData.laminatingProcessB')" value="stepB" />
        </el-select>
      </el-col>
    </el-row>

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

@@ -68,7 +68,7 @@

    List<TeamOutputDTO> teamOutputMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

    List<Map<String, String>> workInProgressOrderMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

@@ -94,7 +94,7 @@

    Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
    Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

    String getLaminating(String selectProcesses);


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

@@ -433,8 +433,8 @@
        String laminating = reportMapper.getLaminating(selectProcesses);
        map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
        map.put("process", productionSchedulingMapper.selectProcess());
        map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
        map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses, teamOutputDTO));
        map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
        map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
        return map;
    }


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

@@ -1368,12 +1368,25 @@
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>

        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating != 'laminating'">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,
@@ -1468,12 +1481,25 @@
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>

        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating != 'laminating'">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,
@@ -2070,12 +2096,25 @@
        <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
            and od.edging_type regexp #{teamOutputDTO.edgingType}
        </if>
        GROUP BY
        rw.reporting_work_id,
        rw.process_id,
        rw.this_process,
        rw.teams_groups_name,
        rwd.order_number
        <choose>
            <when test="laminating != 'laminating'">
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number,
                rwd.technology_number
            </when>
            <otherwise>
                GROUP BY
                rw.reporting_work_id,
                rw.process_id,
                rw.this_process,
                rw.teams_groups_name,
                rwd.order_number
            </otherwise>
        </choose>
        ORDER BY
        rw.this_process,
        rw.process_id,

			@@ -897,7 +897,8 @@
			selectFile:'حدد الملف',
			msg3:'يمكن تحميل ملفات jpg/png فقط ويجب ألا يتجاوز حجمها 5 ميغابايت',
			commonProcess:'普通工序',
			laminatingProcess:'合片工序',
			laminatingProcessA:'合片A',
			laminatingProcessB:'合片B',
			},
			machine:{
			page:{

			@@ -897,7 +897,8 @@
			selectFile:'Selecting file',
			msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
			commonProcess:'普通工序',
			laminatingProcess:'合片工序',
			laminatingProcessA:'合片A',
			laminatingProcessB:'合片B',
			},
			machine:{
			page:{

			@@ -896,7 +896,8 @@
			selectFile:'选取文件',
			msg3:'只能上传jpg/png文件,且不超过5m',
			commonProcess:'普通工序',
			laminatingProcess:'合片工序',
			laminatingProcessA:'合片A',
			laminatingProcessB:'合片B',
			},
			machine:{
			page:{

			@@ -907,7 +907,8 @@
			selectFile:'选取文件',
			msg3:'只能上传jpg/png文件,且不超过5m',
			commonProcess:'普通工序',
			laminatingProcess:'合片工序',
			laminatingProcessA:'合片A',
			laminatingProcessB:'合片B',
			},
			machine:{
			page:{

			@@ -225,7 +225,8 @@
			<el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
			<el-select v-model="basic.nickname" v-else>
			<el-option :label="$t('orderBasicData.commonProcess')" value="" />
			<el-option :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
			<el-option :label="$t('orderBasicData.laminatingProcessA')" value="stepA" />
			<el-option :label="$t('orderBasicData.laminatingProcessB')" value="stepB" />
			</el-select>
			</el-col>
			</el-row>

			@@ -68,7 +68,7 @@

			List<TeamOutputDTO> teamOutputMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

			Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
			Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

			List<Map<String, String>> workInProgressOrderMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

			@@ -94,7 +94,7 @@

			Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

			Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);
			Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

			String getLaminating(String selectProcesses);

			@@ -433,8 +433,8 @@
			String laminating = reportMapper.getLaminating(selectProcesses);
			map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
			map.put("process", productionSchedulingMapper.selectProcess());
			map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
			map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses, teamOutputDTO));
			map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
			map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));
			return map;
			}

			@@ -1368,12 +1368,25 @@
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>

			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			<choose>
			<when test="laminating != 'laminating'">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number,
			rwd.technology_number
			</when>
			<otherwise>
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			</otherwise>
			</choose>
			ORDER BY
			rw.this_process,
			rw.process_id,
			@@ -1468,12 +1481,25 @@
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>

			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			<choose>
			<when test="laminating != 'laminating'">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number,
			rwd.technology_number
			</when>
			<otherwise>
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			</otherwise>
			</choose>
			ORDER BY
			rw.this_process,
			rw.process_id,
			@@ -2070,12 +2096,25 @@
			<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
			and od.edging_type regexp #{teamOutputDTO.edgingType}
			</if>
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			<choose>
			<when test="laminating != 'laminating'">
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number,
			rwd.technology_number
			</when>
			<otherwise>
			GROUP BY
			rw.reporting_work_id,
			rw.process_id,
			rw.this_process,
			rw.teams_groups_name,
			rwd.order_number
			</otherwise>
			</choose>
			ORDER BY
			rw.this_process,
			rw.process_id,