ERP_override.git

			@@ -353,14 +353,16 @@
			title: t('order.OrderNum'),
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged, width: 100
			filterMethod: filterChanged, width: 120
			, sortable: true
			},
			{
			field: 'technology_number',
			title: t('processCard.technologyNumber'),
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged, width: 100
			filterMethod: filterChanged, width: 120
			, sortable: true
			},
			{
			field: 'width',

			@@ -1968,15 +1968,15 @@
			JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
			CONCAT(
			od.order_number,') ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR))),
			' = ',fc.quantity ) as numberSize,
			CONCAT(
			od.order_number,')',' ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_width AS CHAR))),
			' X ',
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR)))) as numberSizeQuantity
			TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(ogd.child_height AS CHAR)))) as numberSizeQuantity
			from sd.order as o
			left join sd.order_detail as od on o.order_id = od.order_id
			left join flow_card as fc on o.order_id = fc.order_id and

	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史