Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

getOrderSource获取优化数据接口板件数量错误修复

Browse Source
This commit is contained in:
gaoqr
2026-06-29 17:33:41 +08:00
parent b225261d92
commit 39b870a950
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+7 -5
View File
@@ -484,9 +484,7 @@
ob.name as bodyName, ob.name as bodyName,
ob.room_name as roomName, ob.room_name as roomName,
og.name as processGroupName, og.name as processGroupName,
og.group_type_name as processGroupTypeName, og.group_type_name as processGroupTypeName
oc.name as componentName,
oc.id as componentId
FROM order_plate op FROM order_plate op
@@ -496,8 +494,7 @@
AND op.goods_id = ogs.id AND op.goods_id = ogs.id
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
WHERE op.organ_id = #{organId} WHERE op.organ_id = #{organId}
and op.order_id in and op.order_id in
@@ -506,6 +503,11 @@
</foreach> </foreach>
AND op.deleted = false AND op.deleted = false
AND op.plan_id = #{planId} AND op.plan_id = #{planId}
AND (
(oi.group_id is not null and oi.group_id != 0)
or
(oi.group_id is null and oi.comp_id is null)
)
</select> </select>
<select id="selectIsCuttingPlate" resultType="java.lang.Long"> <select id="selectIsCuttingPlate" resultType="java.lang.Long">
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+7 -6
View File
@@ -413,21 +413,22 @@
ob.name as bodyName, ob.name as bodyName,
ob.room_name, ob.room_name,
og.name as processGroupName, og.name as processGroupName,
og.group_type_name as processGroupTypeName, og.group_type_name as processGroupTypeName
oc.name as componentName,
oc.id as componentId
from order_plate op from order_plate op
join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
where op.organ_id = #{organId} where op.organ_id = #{organId}
and op.deleted = false and op.deleted = false
and op.order_id = #{orderId} and op.order_id = #{orderId}
and (
(oi.group_id is not null and oi.group_id != 0)
or
(oi.group_id is null and oi.comp_id is null)
)
</select> </select>