ERP_override.git

			@@ -366,20 +366,20 @@
			</td>

			<td style="width: 2cm">
			<input style="font-size: 14px;border: 0;width: 100%"
			<input style="font-size: 16px;border: 0;width: 100%"
			v-model="items.width"/>

			</td>
			<td style="width: 2cm">
			<input style="font-size: 14px;border: 0;width: 100%"
			<input style="font-size: 16px;border: 0;width: 100%"
			v-model="items.height"/>

			</td>
			<td style="width: 60px">
			<td style="width: 60px; font-size: 16px;">
			{{ items.quantity }}
			</td>
			<td style="width: 100px">
			<input style="border: 0;width: 100px" v-model="items.area">
			<input style="font-size: 16px; border: 0;width: 100px" v-model="items.area">
			</td>

			<td

			@@ -193,7 +193,7 @@
			editRules: {
			edgingType: [
			{ required: company.edgingType},
			{ min: 0, max: 10, message: t('basicData.msg.max10') }
			{ min: 0, max: 255, message: t('basicData.msg.max255') }
			],
			buildingNumber: [
			{ required: false},

			@@ -1417,7 +1417,15 @@
			AND rwd.completed_quantity > 0
			AND rw.reporting_work_time >= #{selectTime1}
			AND rw.reporting_work_time < #{selectTime2}
			AND POSITION(#{selectProcesses} IN rw.this_process)
			<choose>
			<!-- 有传工序：精确匹配 -->
			<when test="selectProcesses != null and selectProcesses != ''">
			AND rw.this_process = #{selectProcesses}
			</when>
			<!-- 未传工序：不加限制，查所有） -->
			<otherwise>
			</otherwise>
			</choose>
			<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
			AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
			</if>

	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetLuoyangDetails.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/Report.xml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史