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

fix #8

Merged
yanyang merged 1 commits from yanyang into master 2023-02-28 10:19:33 +08:00
Conversation 0 Commits 1 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@ -171,7 +171,7 @@ public class WoPackagingBoxSubstrateController {
boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId); boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId);
WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0); WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0);
if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel()==box.getPowerLevel()) ) if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )
{ {
dto.setId(substrate.getId()); dto.setId(substrate.getId());
woPackagingBoxSubstrateService.insertSubstrate(dto); woPackagingBoxSubstrateService.insertSubstrate(dto);

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
View File

@ -40,7 +40,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
wrapper.like(StringUtils.isNotBlank(name), PrintModel.NAME, name); wrapper.like(StringUtils.isNotBlank(name), PrintModel.NAME, name);
if(params.get("type")!=null) { if(params.get("type")!=null) {
Integer type = Integer.parseInt(params.get("type").toString()); Integer type = Integer.parseInt(params.get("type").toString());
wrapper.eq(ObjectUtils.isNotNull(type), PrintModel.LINE_BODY, type); wrapper.eq(ObjectUtils.isNotNull(type), PrintModel.TYPE, type);
} }
if(params.get("lineBody")!=null) { if(params.get("lineBody")!=null) {
Integer lineBody = Integer.parseInt(params.get("lineBody").toString()); Integer lineBody = Integer.parseInt(params.get("lineBody").toString());