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

新增字段返回

Browse Source
This commit is contained in:
lym
2024-11-29 16:47:49 +08:00
parent 2a99653d11
commit 9d51ad3023
6 changed files with 12 additions and 6 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/order/vo/order/OrderPlatesDetailReqVO.java
+3
View File
@@ -24,6 +24,9 @@ public class OrderPlatesDetailReqVO {
@Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰")
private String plateNo;
@Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "00001")
private String customPlateNo;
@Schema(description = "材质", requiredMode = Schema.RequiredMode.REQUIRED, example = "晨丰")
private String material;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java
+5 -2
View File
@@ -29,10 +29,13 @@ public class PlateRespVO extends PageParam {
@ExcelProperty("板名称")
private String name;
@Schema(description = "自定义板编号,设计有板编号，则保留设计板编号；设计没有且在机台设置中设置了自定义板编号规则，则按规则自动生成", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("自定义板编号,设计有板编号，则保留设计板编号；设计没有且在机台设置中设置了自定义板编号规则，则按规则自动生成")
@Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("板编号")
private String plateNo;
@Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "00001")
private String customPlateNo;
@Schema(description = "板类型，0 层板 1 立板 2 背板", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("板类型，0 层板 1 立板 2 背板")
private Integer type;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+1 -1
View File
@@ -780,7 +780,7 @@ public class ApiTypeRealize {
.organId(organId)
.roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName())
.bodyName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getName())
.customPlateNo(new StringBuilder())
.customPlateNoBuilder(new StringBuilder())
.build();
// item 明细
OrderItemDO itemPlate = OrderItemDO.builder()
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java
+1 -1
View File
@@ -316,7 +316,7 @@ public class ExcelTypeRealize {
.remark(remarkExtract(combination.remarkJSON()))
.roomName(roomName)
.bodyName(bodyName)
.customPlateNo(new StringBuilder())
.customPlateNoBuilder(new StringBuilder())
.build();
plateDOS.add(plateDO);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+1 -1
View File
@@ -869,7 +869,7 @@ public class XmlTypeRealize {
.isSpecialShaped(convertToBoolean(blockXmlVO.getUnregular()))
.roomName(positionVO.getRoomName())
.bodyName(positionVO.getBoxName())
.customPlateNo(new StringBuilder())
.customPlateNoBuilder(new StringBuilder())
.build();
orderItemMap.put(blockXmlVO.getProductionCode(), OrderItemDO.builder()
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<select id="selectPlatesDetailByOrderId" resultType="com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO">
SELECT DISTINCT i.order_id, p.id, p.plate_no, g.material, p.name, p.area, p.seal_left, p.seal_down,
p.seal_right, p.seal_up, p.texture, p.is_special_shaped, p.is_sculpt, p.unregular_point_count, p.front_hole_count,
p.back_hole_count, p.side_hole_count,p.width,p.height,p.thickness,p.remark,g.color,p.is_row_hole
p.back_hole_count, p.side_hole_count,p.width,p.height,p.thickness,p.remark,g.color,p.is_row_hole, p.custom_plate_no
FROM order_item i
RIGHT JOIN `order_plate` p ON i.plate_id = p.id
LEFT JOIN `order_goods` g ON g.id = p.goods_id