sun15684712291/impm_zxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

每轮损耗不显示的问题

Browse Source
This commit is contained in:
sunyg
2025-08-15 16:10:12 +08:00
parent 778788cd0b
commit 875181b74e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ktg-admin/src/main/resources/application-dev.yml
View File

@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://101.43.210.133:3306/mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: yzhs@123 password: root
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

6
ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
View File

@ -188,8 +188,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.unit_of_measure as unitOfMeasure, t1.unit_of_measure as unitOfMeasure,
t1.machinery_name as machineryName, t1.machinery_name as machineryName,
t1.machinery_no as machineryNo, t1.machinery_no as machineryNo,
t3.use_quantity - t4.rt_quantity AS itemQuantity, ifnull(t3.use_quantity,0) - ifnull(t4.rt_quantity,0) AS itemQuantity,
t5.productQuantity ifnull(t5.productQuantity,0) as productQuantity
from pro_workorder t1 from pro_workorder t1
left join pro_machinery_job t2 on t1.workorder_id = t2.workorder_id left join pro_machinery_job t2 on t1.workorder_id = t2.workorder_id
LEFT JOIN ( LEFT JOIN (
@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND wpr.workorder_id IS NOT NULL AND wpr.workorder_id IS NOT NULL
GROUP BY GROUP BY
wpr.workorder_id wpr.workorder_id
) AS t5 ON t1.workorder_id = t4.workorder_id ) AS t5 ON t1.workorder_id = t5.workorder_id
<where> <where>
<if test="workorderCode != null and workorderCode != ''">and t1.workorder_code = #{workorderCode}</if> <if test="workorderCode != null and workorderCode != ''">and t1.workorder_code = #{workorderCode}</if>
<if test="workorderName != null and workorderName != ''">and t1.workorder_name like concat('%', #{workorderName}, '%')</if> <if test="workorderName != null and workorderName != ''">and t1.workorder_name like concat('%', #{workorderName}, '%')</if>