ERP_override.git

			@@ -344,6 +344,7 @@
			{field: 'founder', title: t('processCard.founder'),},
			{field: 'orderDetail.processingNote', title: t('order.processingNote'),},
			{field: 'order.createTime', title: t('report.orderTime'),width: 110},
			{field: 'order.updateTime', title: t('productStock.approvedDate'),width: 110},
			{field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
			{field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
			{field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}

			@@ -26,6 +26,7 @@
			<result column="processing_note" property="processingNote"/>
			<result column="delivery_address" property="deliveryAddress"/>
			<result column="create_time" property="createTime"/>
			<result column="update_time" property="updateTime"/>
			</association>
			<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
			<result column="product_id" property="productId"/>
			@@ -71,7 +72,8 @@
			a.merge,
			a.rack,
			b.batch,
			b.create_time
			b.create_time,
			b.update_time
			from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,max(merge) as merge,rack from flow_card
			group by process_Id,order_number) as a
			left join sd.`order` as b on a.order_Id=b.order_id

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