ERP_override.git

			@@ -266,6 +266,8 @@
			{field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'breakageType', width: 120, title: t('reportingWorks.breakageType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'breakageReason', width: 120, title: t('reportingWorks.breakageReason'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'childWidth', width: 100, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'childHeight', width: 100, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
			{field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken')},
			{field: 'area', width: 120, title: t('reportingWorks.wornArea')},
			{field: 'personnel', width: 120, title: t('reportingWorks.responsiblePersonnel')},

			@@ -103,6 +103,8 @@
			<result column="personnel" property="personnel"/>
			<result column="glass_child" property="glassChild"/>
			<result column="glassNumber" property="glassNumber"/>
			<result column="child_width" property="childWidth"/>
			<result column="child_height" property="childHeight"/>
			</resultMap>

			<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
			@@ -574,6 +576,8 @@
			round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
			IFNULL(dd.responsible_personnel,'') as personnel,
			ogd.glass_child,
			ogd.child_width,
			ogd.child_height,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
			FROM
			sd.ORDER AS o

	north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史