From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 189 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 5c64617..5a78a5b 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -1,67 +1,162 @@
-<?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 id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
select ppm.*,
- pwo.work_order_no as workOrderNo,
- pwo.status as workOrderStatus,
- u.nick_name as nickName,
+ pot.work_order_no as workOrderNo,
+ case pot.status
+ when 1 then '寰呯‘璁�'
+ when 2 then '寰呯敓浜�'
+ when 3 then '鐢熶骇涓�'
+ when 4 then '宸茬敓浜�'
+ else '鏈煡'
+ end as workOrderStatus,
+ su.nick_name as nickName,
+ ifnull(ppo.quantity, 0) as quantity,
+ ifnull(ppo.scrap_qty, 0) as scrapQty,
p.product_name as productName,
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_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
+ po_sales.salesContractNo,
+ date(ppm.create_time) as schedulingDate,
+ su.nick_name as schedulingUserName,
+ po_sales.customerName,
+ poro.operation_name as process
+ from production_product_main ppm
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ left join production_order po on pot.production_order_id = po.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join (
+ select po2.id as orderId,
+ group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
+ group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName
+ from production_order po2
+ left join production_plan pp2
+ on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
+ left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
+ group by po2.id
+ ) po_sales on po_sales.orderId = po.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
+ left join product p on pm.product_id = p.id
+ left join sys_user su on ppm.create_user = su.user_id
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
<where>
- <if test="c.nickName != null and c.nickName != ''">
- and u.nick_name like concat('%',#{c.nickName},'%')
+ <if test="c.productNo != null and c.productNo != ''">
+ and ppm.product_no like concat('%', #{c.productNo}, '%')
</if>
<if test="c.workOrderNo != null and c.workOrderNo != ''">
- and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+ and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
</if>
- <if test="c.workOrderStatus != null and c.workOrderStatus != ''">
- and pwo.status = #{c.workOrderStatus}
+ <if test="c.salesContractNo != null and c.salesContractNo != ''">
+ and po_sales.salesContractNo like concat('%', #{c.salesContractNo}, '%')
</if>
- <if test="c.status != null and c.status != ''">
- and ppm.status = #{c.status}
+ <if test="c.customerName != null and c.customerName != ''">
+ and po_sales.customerName like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.productModelName != null and c.productModelName != ''">
+ and pm.model like concat('%', #{c.productModelName}, '%')
+ </if>
+ <if test="c.process != null and c.process != ''">
+ and poro.operation_name like concat('%', #{c.process}, '%')
+ </if>
+ <if test="c.schedulingDate != null">
+ and date(ppm.create_time) = #{c.schedulingDate}
+ </if>
+ <if test="c.productMainId != null">
+ and ppm.id = #{c.productMainId}
</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}
+ order by ppm.create_time desc
</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=")">
+ <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
+ select null
+ </select>
+
+ <select id="listProductionDetails" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
+ select ppm.*,
+ pot.work_order_no as workOrderNo,
+ p.product_name as productName,
+ pm.model as productModelName,
+ pm.unit,
+ pa.technology_operation_name as process,
+ ifnull(ppo.quantity, 0) as quantity,
+ ifnull(ppo.scrap_qty, 0) as scrapQty,
+ date(pa.scheduling_date) as schedulingDate,
+ pa.scheduling_user_name as schedulingUserName,
+ cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
+ cast(
+ ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
+ case
+ when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
+ then cast(substring_index(pm.model, '*', -1) as decimal(18,4))
+ else 1
+ end
+ as decimal(18,4)
+ ) as wages
+ from production_account pa
+ left join production_product_main ppm on ppm.id = pa.production_product_main_id
+ left join production_operation_task pot on ppm.production_operation_task_id = pot.id
+ left join production_order po on pot.production_order_id = po.id
+ left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
+ left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
+ left join product p on pm.product_id = p.id
+ left join product p_parent on p_parent.id = p.parent_id
+ left join production_product_output ppo on ppo.production_product_main_id = ppm.id
+ <where>
+ <if test="c != null">
+ <if test="c.productCategory != null and c.productCategory != ''">
+ and p_parent.product_name like concat('%', #{c.productCategory}, '%')
+ </if>
+ <if test="c.specificationModel != null and c.specificationModel != ''">
+ and pm.model like concat('%', #{c.specificationModel}, '%')
+ </if>
+ <if test="c.schedulingUserId != null">
+ and pa.scheduling_user_id = #{c.schedulingUserId}
+ </if>
+ <if test="c.schedulingUserName != null and c.schedulingUserName != ''">
+ and pa.scheduling_user_name like concat('%', #{c.schedulingUserName}, '%')
+ </if>
+ <if test="c.process != null and c.process != ''">
+ and pa.technology_operation_name like concat('%', #{c.process}, '%')
+ </if>
+ <if test="c.entryDate != null">
+ and date(pa.scheduling_date) = #{c.entryDate}
+ </if>
+ <if test="c.entryDateStart != null">
+ and date(pa.scheduling_date) >= #{c.entryDateStart}
+ </if>
+ <if test="c.entryDateEnd != null">
+ and date(pa.scheduling_date) <= #{c.entryDateEnd}
+ </if>
+ </if>
+ </where>
+ order by pa.scheduling_date desc, pa.id desc
+ </select>
+
+ <select id="listMain" resultType="java.lang.Long">
+ select id
+ from production_product_main
+ where production_operation_task_id in
+ <foreach collection="list" item="id" open="(" separator="," close=")">
#{id}
</foreach>
- </delete>
+ </select>
+
</mapper>
--
Gitblit v1.9.3