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-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化生产-加工组信息Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-07-17 10:21:54 +08:00
parent 497cb3c88b
commit 1ca74cf233
2 changed files with 15 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/java/com/cf/imes/module/executor/controller/admin/plan/bo/ProcessGroupList.java
+4 -2
View File
@@ -10,11 +10,13 @@ import lombok.Data;
public class ProcessGroupList { public class ProcessGroupList {
@Schema(description = "加工组ID")
private Long groupId;
@Schema(description = "加工组名称") @Schema(description = "加工组名称")
private String groupName; private String groupName;
// @Schema(description = "加工组ID")
// private String groupId;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+11 -9
View File
@@ -162,18 +162,20 @@
<result property="roomName" column="roomName"/> <result property="roomName" column="roomName"/>
<result property="hasHole" column="hasHole"/> <result property="hasHole" column="hasHole"/>
<collection property="processGroupLists" javaType="java.util.List" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList"> <collection property="processGroupLists" javaType="java.util.List" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList" >
<result property="groupId" column="groupId"/>
<result property="groupName" column="groupName"/> <result property="groupName" column="groupName"/>
</collection >
</collection>
</resultMap> </resultMap>
<select id="selectPlateDetialList" <select id="selectPlateDetialList"
resultMap="PlateDetialMap" resultMap="PlateDetialMap"
resultType="java.lang.Long"> resultType="java.lang.Long">
select distinct select distinct
oi.group_id as groupId,
og.name as groupName,
op.id as plateId, op.id as plateId,
op.order_id as orderId, op.order_id as orderId,
op.name as name, op.name as name,
@@ -218,8 +220,7 @@
ob.room_id as roomId, ob.room_id as roomId,
ob.name as bodyName, ob.name as bodyName,
ob.room_name as roomName, ob.room_name as roomName,
op.is_row_hole as hasHole, op.is_row_hole as hasHole
og.name as groupName
from order_plate op from order_plate op
join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
@@ -236,6 +237,8 @@
resultType="java.lang.Long"> resultType="java.lang.Long">
select distinct select distinct
oi.group_id as groupId,
og.name as groupName,
op.id as plateId, op.id as plateId,
op.order_id as orderId, op.order_id as orderId,
op.name as name, op.name as name,
@@ -280,8 +283,7 @@
ob.room_id as roomId, ob.room_id as roomId,
ob.name as bodyName, ob.name as bodyName,
ob.room_name as roomName, ob.room_name as roomName,
op.is_row_hole as hasHole, op.is_row_hole as hasHole
og.name as groupName
from order_plate op from order_plate op
join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id
join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id join order_item oi on op.id = oi.plate_id and op.organ_id = oi.organ_id