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

Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server

Browse Source
This commit is contained in:
lym
2025-02-14 15:16:03 +08:00
parent 7d142b6afe 5ffd6daaa6
commit 5fa0b0587c
47 changed files with 1516 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
+3 -2
View File
@@ -6,8 +6,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
@@ -42,6 +40,9 @@ public class PlateDetailsRespVO {
@Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String plateId;
@Schema(description = "自定义板编号", requiredMode = Schema.RequiredMode.REQUIRED)
private String customPlateNo;
@Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("板编号")
private String plateNo;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/plate/OrderPlateMapper.xml
+2
View File
@@ -213,6 +213,7 @@
<result property="plateNo" column="plateNo"/>
<result property="orderId" column="orderId"/>
<result property="plateName" column="plateName"/>
<result property="customPlateNo" column="customPlateNo"/>
<result property="material" column="plateMaterial"/>
<result property="color" column="plateColor"/>
<result property="width" column="plateWidth"/>
@@ -243,6 +244,7 @@
op.id as plateId,
op.plate_no as plateNo,
op.name as plateName,
op.custom_plate_no as customPlateNo,
ogs.material as plateMaterial,
ogs.color as plateColor,
op.order_id as orderId,