From ebae0c1137ba96d38e5b2323577129d2c9ff2e6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 09:45:59 +0800
Subject: [PATCH] 1、优化配置文件； 2、优化ID生成器代码； 3、修改注释； 4、修改权限初始化时算法； 5、导出Excel文件功能归为一个新类； 6、工站数据库存入验空修改；
---
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 6531127..0fbe098 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -23,6 +23,8 @@
<result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager"/>
+ <association property="proType" column="pro_id" javaType="java.lang.Long"
+ select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager"/>
<association property="batchNo" column="batch_id" javaType="java.lang.Long"
@@ -430,7 +432,7 @@
</select>
<select id="queryPlanList" resultType="cn.hutool.json.JSONObject">
- select pp.`name` as pro_name, p.`name` ,p.number, p.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date,
+ select pp.`name` as pro_name, p.`name` ,p.number,p.input_number, p.output_number, concat(round(((p.output_number/p.number) * 100 ),0), '%') as complete_rate ,p.end_date,
TIMESTAMPDIFF(DAY, NOW(),p.end_date) AS days_difference
from (SELECT * FROM pr_assembly_plan WHERE STATUS = 1 and deleted = 0) p
LEFT JOIN plt_product pp
--
Gitblit v1.8.0