From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index ab3911e..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,
@@ -49,7 +49,7 @@
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,7 +87,7 @@
actual_start_time >= #{startDate}
AND actual_start_time <= #{endDate}
</select>
- <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
+ <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},'%')
--
Gitblit v1.9.3