From 8e7a3c666533bbfa7f35ab7d7c8638a54c9f31a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 21 四月 2026 16:00:07 +0800
Subject: [PATCH] feat(production): 添加生产管理模块相关DTO、VO及控制器
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index fef6bef..15466a0 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductWorkOrderMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductWorkOrder">
+ <resultMap id="BaseResultMap" type="com.ruoyi.production2.pojo.ProductWorkOrder">
<result column="id" property="id"/>
<result column="product_process_route_item_id" property="productProcessRouteItemId"/>
<result column="create_time" property="createTime"/>
@@ -18,7 +18,7 @@
<result column="actualEndTime" property="actualEndTime"/>
</resultMap>
- <select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ <select id="pageProductWorkOrder" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
SELECT
pwo.*,
pp.NAME as processName,
@@ -45,11 +45,11 @@
<if test="c.planStartTime != null and c.planEndTime != null">
and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
</if>
- <if test="c.productOrderId != null and c.productOrderId != ''">
- and pwo.product_order_id = #{c.productOrderId}
+ <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+ and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
</if>
</select>
- <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
SELECT
pwo.*,
pp.NAME as processName,
@@ -76,7 +76,7 @@
p.product_name,
po.nps_no
</select>
- <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production2.dto.ProductWorkOrderDto">
SELECT
id,
actual_start_time AS planStartTime,
@@ -87,4 +87,12 @@
actual_start_time >= #{startDate}
AND actual_start_time <= #{endDate}
</select>
+ <select id="selectMax" resultType="com.ruoyi.production2.pojo.ProductWorkOrder">
+ SELECT SUBSTRING(work_order_no, 3) as work_order_no
+ FROM product_work_order
+ WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
+ order by work_order_no desc
+ limit 1
+ ;
+ </select>
</mapper>
--
Gitblit v1.9.3