ERP_override.git

			@@ -173,4 +173,6 @@
			List<Map<String, Object>> selectFlowCardMerge(String processId);

			Boolean updateFlowCardMerge(String processId);

			Boolean deleteflowCardSort(String orderId, String processId);
			}

			@@ -85,6 +85,8 @@
			flowCardMapper.deleteReportingWork(processId);
			//删除分架明细
			flowCardMapper.deleteFlowCardMp(orderId, processId);
			//删除排序表数据
			flowCardMapper.deleteflowCardSort(orderId, processId);
			//判断该订单流程卡是否全部删除
			Integer flowNumber = flowCardMapper.selectFlowCardCount(orderId);
			if (flowNumber == 0) {

			@@ -1989,7 +1989,7 @@
			od.processing_note as processingNote,
			width,
			height,
			od.quantity,
			fc.quantity,
			od.order_number as orderNumber,
			fc.technology_number as technologyNumber,
			od.building_number as buildingNumber,
			@@ -2027,7 +2027,7 @@
			ogd.technology_number = fc.technology_number
			where fc.process_id = #{processId}
			and fc.order_number = #{orderNumber}
			group by fc.process_id, od.order_number, width, height
			group by od.order_number, width, height
			order by fc.process_id
			</select>

			@@ -2103,4 +2103,8 @@
			where fc.process_id = #{processId}
			</update>

			<delete id="deleteflowCardSort">
			delete from flow_card_sort where process_id = #{processId}
			</delete>

			</mapper>

	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史