ERP_override.git

			@@ -37,7 +37,8 @@
			contacts:'order.contacts',
			deliveryAddress:'order.deliveryAddress',
			processingNote:'order.processingNote',
			remarks:'product.msg.remarks'
			remarks:'product.msg.remarks',
			customerAbbreviation:'customer.customerAbbreviation'

			})

			@@ -424,11 +424,9 @@
			//改变brokenVisible的值触发openedBrokenTable（）方法
			const { rows, column, cell } = params; // 解构获取行、列和单元格信息
			//点击次破数量时打开明细界面
			if(column.title=="次破数量"){
			if(column.field=="breakageQuantity"){
			brokenVisible.value = true
			}


			},
			menuClick({menu, row, column}) {
			const $grid = xGrid.value

			@@ -636,7 +636,7 @@
			select o.order_id as orderId,
			project,
			customer_id as customerId,
			customer_name as customerName,
			o.customer_name as customerName,
			order_type as orderType,
			order_classify as orderClassify,
			batch,
			@@ -658,13 +658,14 @@
			od.building_number as buildingNumber,
			od.product_name as productName,
			od.edging_type as edgingType,
			p.remarks

			p.remarks,
			c.customer_abbreviation as customerAbbreviation
			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
			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	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史