CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

yanyang #39

Merged
yanyang merged 2 commits from yanyang into master 2024-02-02 14:45:24 +08:00
Conversation 0 Commits 2 Files Changed 4 +24 -7
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java
View File

@ -79,12 +79,12 @@ public class ProductLevelController {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
//验证编码是否重名
QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
wrapper1.eq(ProductLevel.CODE, dto.getCode());
if(productLevelMapper.selectCount(wrapper1)!= 0){
return new Result().error(1,"编码重复");
}
// //验证编码是否重名
// QueryWrapper<ProductLevel> wrapper1 = new QueryWrapper<>();
// wrapper1.eq(ProductLevel.CODE, dto.getCode());
// if(productLevelMapper.selectCount(wrapper1)!= 0){
// return new Result().error(1,"编码重复");
// }
//验证名称是否重名
QueryWrapper<ProductLevel> wrapper2 = new QueryWrapper<>();
wrapper2.eq(ProductLevel.PRODUCT_LEVEL, dto.getProductLevel());

8
ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java
View File

@ -38,6 +38,14 @@ public class WoPackagingBoxSubstrateExcel {
private Float actualPmpp;
@Excel(name = "线体")
private Integer lineBody;
@Excel(name = "盖板")
private String coverName;
@Excel(name = "产品等级")
private String productGrade;
@Excel(name = "最大额定熔断电流")
private String maxFuseCurrent;
@Excel(name = "节数")
private String pitchNumber;
@Excel(name = "最近打印时间")
private String printTime1;

8
ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateManualExcel.java
View File

@ -26,6 +26,14 @@ public class WoPackagingBoxSubstrateManualExcel {
private String powerLevel;
@Excel(name = "线体")
private Integer lineBody;
@Excel(name = "盖板")
private String coverName;
@Excel(name = "产品等级")
private String productGrade;
@Excel(name = "最大额定熔断电流")
private String maxFuseCurrent;
@Excel(name = "节数")
private String pitchNumber;
@Excel(name = "最近打印时间")
private String printTime1;

3
ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
View File

@ -124,7 +124,8 @@
<select id="substrateList" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
select
twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime
twpb.CREATE_TIME as boxCreateTime,twpbs.*,twpb.PRINT_TIME as printTime,
twpb.product_grade as productGrade, twpb.pitch_number as pitchNumber, twpb.max_fuse_current as maxFuseCurrent, twpb.cover_name as coverName
from t_wo_packaging_box_substrate twpbs
left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
<where>