From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期日, 09 三月 2025 23:51:28 +0800 Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改：10mm及以上厚度的玻璃走直通任务，厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询，同一个流程卡同一层出现2种厚度，导致厚度赋值异常，目前已改为查询最后一次导入的为准 --- 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