ERP_override.git

			@@ -26,19 +26,36 @@
			productName:'order.product',
			edgingType:"order.edgingType",
			buildingNumber:'order.buildingNumber',
			icon:'order.icon',
			orderClassify:'order.orderClassify',
			packType:'order.packType',
			deliveryDate:'order.deliveryDate',
			batch:'order.batch',
			salesman:'order.salesman',
			alType:'order.alType',
			customerBatch:'order.customerBatch',
			contacts:'order.contacts',
			deliveryAddress:'order.deliveryAddress',
			processingNote:'order.processingNote',
			remarks:'product.msg.remarks',
			customerAbbreviation:'customer.customerAbbreviation'
			customerAbbreviation:'customer.customerAbbreviation',
			productAbbreviation:'product.msg.productAbbreviation',
			processId:'processCard.processId',
			createTime:'下单日期',
			orderNumber:'order.OrderNum',
			technologyNumber:'processCard.technologyNumber',
			process:'orderBasicData.process',
			color:'mainIngredient.films',
			figureNumber:'图号',
			colourCeramicGlaze:'彩釉图号',
			glassNumber:"reportingWorks.glassNumber",
			remarks1:'备注1',
			remarks2:'备注2',
			remarks3:'备注3',
			remarks4:'备注4',
			filmNumber:'膜号'







			})

			@@ -736,13 +736,25 @@
			od.edging_type as edgingType,
			p.remarks,
			c.customer_abbreviation as customerAbbreviation,
			od.other_columns
			p.product_abbreviation as productAbbreviation,
			fc.process_id as processId,
			o.create_time as createTime,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S02' )) AS figureNumber,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S03' )) AS colourCeramicGlaze,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S04' )) AS remarks1,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S05' )) AS remarks2,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S06' )) AS remarks3,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S07' )) AS remarks4,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S08' )) AS remarks5,
			p.remarks as filmNumber
			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
			od.order_number = fc.order_number
			left join sd.product as p on p.id=od.product_id
			left join sd.customer as c on c.id = o.customer_id
			left join sd.product_detail as pd on pd.prod_id=p.id and pd.sort_num=od.order_number
			where fc.process_id = #{processId}
			and fc.technology_number = #{technologyNumber}
			group by od.order_number, width, height

	north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史