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/ProductionProductMainMapper.xml | 128 ++++--------------------------------------
1 files changed, 12 insertions(+), 116 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..d108498 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -1,121 +1,17 @@
-<?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">
+<?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.ProductionProductMainMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductMain">
- <id property="id" column="id"/>
- <result property="productNo" column="product_no"/>
- <result property="userId" column="user_id"/>
- <result property="workOrderId" column="work_order_id"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
- <result property="status" column="status"/>
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionProductMain">
+ <id column="id" property="id" />
+ <result column="product_no" property="productNo" />
+ <result column="production_operation_task_id" property="productionOperationTaskId" />
+ <result column="dept_id" property="deptId" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
</resultMap>
- <select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
- select ppm.*,
- pwo.work_order_no as workOrderNo,
- pwo.status as workOrderStatus,
- u.nick_name as nickName,
- p.product_name as productName,
- pp.name as process,
- pm.model as productModelName,
- ppo.quantity,
- ppo.scrap_qty,
- pm.unit,
- sl.sales_contract_no salesContractNo
- from
- production_product_main ppm
- left join product_work_order pwo on pwo.id = ppm.work_order_id
- left join product_process_route_item ppri on ppri.id = pwo.product_process_route_item_id
- left join product_process pp on pp.id = ppri.process_id
- left join product_order po on po.id = pwo.product_order_id
- left join production_product_output ppo on ppm.id = ppo.product_main_id
- left join product_model pm on pm.id = ppo.product_model_id
- left join product p on p.id = pm.product_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
- left join sys_user u on u.user_id = ppm.user_id
- <where>
- <if test="c.nickName != null and c.nickName != ''">
- and u.nick_name like concat('%',#{c.nickName},'%')
- </if>
- <if test="c.workOrderNo != null and c.workOrderNo != ''">
- and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
- </if>
- <if test="c.workOrderStatus != null and c.workOrderStatus != ''">
- and pwo.status = #{c.workOrderStatus}
- </if>
- <if test="c.status != null and c.status != ''">
- and ppm.status = #{c.status}
- </if>
- </where>
- order by ppm.id
-
- </select>
- <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
- select po.*
- from product_order po
- left join product_work_order pwo on po.id = pwo.product_order_id
- left join production_product_main pm on work_order_id = pwo.id
- where pm.id = #{productMainId}
- </select>
- <select id="listProductionDetails" resultType="com.ruoyi.production.dto.ProductionProductMainDto">
- SELECT
- slpa.scheduling_date,
- slpa.scheduling_user_name,
- sl.sales_contract_no,
- sl.customer_name,
- p.product_name,
- pm.model as product_model_name,
- pm.unit,
- slpa.process,
- ppo.quantity,
- slpa.work_hours,
- slpa.work_hours * slpa.finished_num AS wages
- FROM
- production_product_main ppm
- LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
- LEFT JOIN production_product_output ppo ON ppm.id = ppo.product_main_id
- LEFT JOIN product_work_order pwo ON pwo.id = ppm.work_order_id
- LEFT JOIN product_order po ON po.id = pwo.product_order_id
- LEFT JOIN process_route pr ON pr.id = po.route_id
- LEFT JOIN product_model pm ON po.product_model_id = pm.id
- LEFT JOIN product p ON p.id = pm.product_id
- LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
- <where>
- <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
- and slpa.scheduling_user_name = #{ew.schedulingUserName}
- </if>
- <if test="ew.entryDate != null " >
- and slpa.scheduling_date >= #{ew.entryDate}
- and slpa.scheduling_date < DATE_ADD(#{ew.entryDate}, INTERVAL 1 DAY)
- </if>
- <if test="ew.entryDateStart != null and ew.entryDateEnd != null" >
- and slpa.scheduling_date >= #{ew.entryDateStart}
- and slpa.scheduling_date < date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
- </if>
- </where>
- </select>
- <select id="listMain" resultType="java.lang.Long">
- SELECT ppm.id FROM production_product_main ppm
- left join product_work_order pwo on pwo.id = ppm.work_order_id
- left join product_order po on po.id = pwo.product_order_id
- left join sales_ledger sl on sl.id = po.sales_ledger_id
- <where>
- <if test="idList != null and idList.size() > 0">
- and sl.id in
- <foreach item="id" collection="idList" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
- </where>
- </select>
-
- <delete id="deleteByWorkOrderIds" parameterType="java.util.List">
- DELETE FROM production_product_main
- WHERE work_order_id IN
- <foreach collection="workOrderIds" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
</mapper>
--
Gitblit v1.9.3