From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
new file mode 100644
index 0000000..a80fd02
--- /dev/null
+++ b/src/main/resources/mapper/production/ProductionOrderPickRecordMapper.xml
@@ -0,0 +1,60 @@
+<?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.ruoyi.production.mapper.ProductionOrderPickRecordMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrderPickRecord">
+        <id column="id" property="id" />
+        <result column="pick_id" property="pickId" />
+        <result column="production_order_id" property="productionOrderId" />
+        <result column="production_operation_task_id" property="productionOperationTaskId" />
+        <result column="product_model_id" property="productModelId" />
+        <result column="batch_no" property="batchNo" />
+        <result column="pick_quantity" property="pickQuantity" />
+        <result column="before_quantity" property="beforeQuantity" />
+        <result column="after_quantity" property="afterQuantity" />
+        <result column="pick_type" property="pickType" />
+        <result column="remark" property="remark" />
+        <result column="feeding_reason" property="feedingReason" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="create_user" property="createUser" />
+        <result column="dept_id" property="deptId" />
+    </resultMap>
+
+    <select id="listPickedDetailByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
+        select popr.*,
+               poro.operation_name as operationName,
+               p.product_name as productName,
+               pm.model as model,
+               pm.unit as unit
+        from production_order_pick_record popr
+                 left join production_operation_task pot on popr.production_operation_task_id = pot.id
+                 left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+                 left join product_model pm on popr.product_model_id = pm.id
+                 left join product p on pm.product_id = p.id
+        where popr.production_order_id = #{productionOrderId}
+        order by popr.create_time desc, popr.id desc
+    </select>
+
+    <select id="listFeedingRecord" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickRecordVo">
+        select popr.*,
+               poro.operation_name as operationName,
+               p.product_name as productName,
+               pm.model as model,
+               pm.unit as unit,
+               coalesce(su.nick_name, su.user_name) as supplementUserName,
+               popr.create_time as supplementTime
+        from production_order_pick_record popr
+                 left join production_operation_task pot on popr.production_operation_task_id = pot.id
+                 left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+                 left join product_model pm on popr.product_model_id = pm.id
+                 left join product p on pm.product_id = p.id
+                 left join sys_user su on popr.create_user = su.user_id
+        where popr.production_order_id = #{productionOrderId}
+          and popr.pick_id = #{pickId}
+          and popr.pick_type = 2
+        order by popr.create_time desc, popr.id desc
+    </select>
+
+</mapper>

--
Gitblit v1.9.3