ERP_override.git

			@@ -170,21 +170,24 @@
			<table >
			<thead style="width: 100%">
			<tr>
			<td colspan="1" style="text-align: center;font-weight: bolder;">
			<div style="width: 35px;height: 35px">
			<img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt="">
			</div>
			</td>
			<td colspan="4" style="font-weight: bolder">
			<div style="font-size: 15px;font-weight: bold;line-height: 15px;">
			<p
			style="font-size: 15px;
			<td colspan="5" >
			<div style="text-align: center;font-weight: bolder;display: flex">
			<div style="width: 35px;height: 35px">
			<img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt="">
			</div>

			<div style="font-size: 15px;font-weight: bold;line-height: 15px;width: 300px">
			<p
			style="font-size: 15px;
			font-weight: bold;
			line-height: 15px;"
			>{{companyAddress.company}}</p>
			<span style="font-size: 8px;">    {{companyAddress.companyInfo}}</span>
			>{{companyAddress.company}}</p>
			<span style="font-size: 8px;">    {{companyAddress.companyInfo}}</span>
			</div>
			</div>

			</td>

			</tr>
			<tr>
			<td colspan="5" style="text-align: center;font-size: 12px">

			@@ -936,11 +936,11 @@
			ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
			od.width,
			od.height,
			fol.quantity,
			sum(fol.quantity) as quantity,
			od.product_name,
			od.product_id,
			ROUND( od.width * od.height * fol.quantity / 1000000, 2 ) as area,
			ROUND( od.width * od.height * fol.quantity / 1000000, 2 )#{thickness}2.5 as weight
			ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
			ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )#{thickness}2.5 as weight
			FROM
			( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '入库' AND aa.STATUS != '已作废' ) fol
			LEFT JOIN sd.order_detail od ON fol.order_id = od.order_id
			@@ -948,6 +948,7 @@
			LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
			WHERE
			o.order_id=#{orderId} and fol.remarks=#{remarks} and od.product_id=#{productId}
			group by od.order_id,od.order_number
			ORDER BY
			fol.operate_time DESC

	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史