ERP_override.git

			@@ -290,6 +290,7 @@
			{
			field: 'project', width: 120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
			},
			{field: 'batch', width: 90, title: t('order.batch')},
			{
			field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
			},

			@@ -312,6 +312,7 @@
			{field: 'childHeight', width: 120, title: t('order.height'),visible: true},
			{field: 'stockNum', width: 120, title: t('productStock.inventoryQuantity'),visible: true},
			{field: 'stockArea', width: 120, title: t('report.inventoryArea'),visible: true},
			{field: 'workProcessName', width: 120, title: t('report.workProcessName')},
			{field: 'productName', width: 120, title: t('order.product'),visible: true},
			{field: 'bendRadius', width: 120, title: t('order.bendRadius'),visible: true},
			{field: 'teamsGroupsName', width: 110,title: t('report.teamsGroupsName'),showOverflow:"ellipsis",filters: [{data: ''}],

			@@ -47,4 +47,6 @@
			private String workProcessName;
			@ExcelProperty("报工设备")
			private String deviceName;
			@ExcelProperty("批次")
			private String batch;
			}

			@@ -1353,7 +1353,8 @@
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			END AS workProcessName
			END AS workProcessName,
			o.batch
			FROM
			reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
			left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
			@@ -1436,7 +1437,8 @@
			CASE
			WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
			ELSE MAX( ogd.glass_child )
			END AS workProcessName
			END AS workProcessName,
			o.batch
			FROM
			reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
			left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number

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