From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 17 十二月 2025 08:30:56 +0800 Subject: [PATCH] 1、 钢化前钢化出片逻辑调整，避免卧转立信号对调度任务的影响 2、修改出片方式，当玻璃未在关系表时，默认出一片 3、中空新增进片线路校验，避免钢化重复报工 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml index 39b3ea8..bc48fb2 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/mapper/xml/OrderMapper.xml @@ -1,5 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.mes.order.mapper.OrderMapper"> - -</mapper> +<!--<mapper namespace="com.mes.order.mapper.OrdersMapper">--> +<!-- <resultMap id="baseMap" type="com.mes.order.entity.dto.OrderDTO">--> +<!-- <result column="order_id" property="orderId"/>--> +<!-- <result column="customer_name" property="customerName"/>--> +<!-- <result column="project" property="project"/>--> +<!-- <result column="area" property="area"/>--> +<!-- <result column="quantity" property="quantity"/>--> +<!-- <result column="create_time" property="createTime"/>--> +<!-- <result column="percent" property="percent"/>--> +<!-- </resultMap>--> +<!-- <select id="selectOrderPercent" resultMap="baseMap">--> +<!-- SELECT a.order_id,--> +<!-- a.customer_name,--> +<!-- a.project,--> +<!-- a.area,--> +<!-- a.quantity,--> +<!-- a.create_time,--> +<!-- round(ifnull(d.finishNum, 0) / a.quantity * 100) as 'percent'--> +<!-- from sd.`order` as a--> +<!-- LEFT JOIN (--> +<!-- SELECT sum(c.reporting_work_num) as 'finishNum',order_id--> +<!-- from sd.order_process_detail as c--> +<!-- where c.id in (--> +<!-- SELECT max(id) from sd.order_process_detail as b GROUP BY b.process_id, order_number--> +<!-- )--> +<!-- GROUP BY c.order_id--> +<!-- ) as d--> +<!-- on a.order_id = d.order_id--> +<!-- where a.warehousing != 2--> +<!-- </select>--> +<!--</mapper>--> -- Gitblit v1.8.0