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

Compare commits

base: CaiXiang:abdcb0749227a736eff711ea5f69e5828c323256
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:802a5474e7a3d6ca8231409d0531c8332f4c0512
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

3 Commits
abdcb07492 ... 802a5474e7

Author SHA1 Message Date
yanyang
802a5474e7 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-31 10:28:04 +08:00
yanyang
a436683e00 slot排序 2023-03-31 10:27:55 +08:00
闫阳
3ab40e515a Merge pull request '装箱单信息查询分页' (#29) from yanyang into master 
Reviewed-on: #29
 2023-03-28 09:31:09 +08:00
2 changed files with 8 additions and 4 deletions
Show Stats Expand all files Collapse all files

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

@ -253,6 +253,13 @@ public class WoPackagingBoxSubstrateController {
@LogOperation("合箱")
public Result insertSubstrate(@RequestBody ChangePackingBoxDTO dto){
//验证包装箱是否为存在
String packagingBoxId = dto.getPackagingBoxId();
QueryWrapper<WoPackagingBox> boxQueryWrapper = new QueryWrapper<>();
boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId);
if(woPackagingBoxMapper.selectCount(boxQueryWrapper)== 0){
return new Result().error(1,"该包装箱不存在,请重新输入");
}
//验证模组是否存在
QueryWrapper<WoPackagingBoxSubstrate> substrateQueryWrapper1 = new QueryWrapper<>();
substrateQueryWrapper1.eq(WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId());
@ -274,9 +281,6 @@ public class WoPackagingBoxSubstrateController {
}
//验证该模组的线体、功率等级是否BoxID的线体、功率等级一致，一致，保存成功，数据发生更新。不一致，则显示保存失败，数据不发生更新
String packagingBoxId = dto.getPackagingBoxId();
QueryWrapper<WoPackagingBox> boxQueryWrapper = new QueryWrapper<>();
boxQueryWrapper.eq(StringUtils.isNotBlank(packagingBoxId), WoPackagingBox.BOX_NO, packagingBoxId);
WoPackagingBox box = woPackagingBoxMapper.selectList(boxQueryWrapper).get(0);
if((substrate.getLineBody()==box.getLineBody()) && (substrate.getPowerLevel().equals(box.getPowerLevel())) )

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

@ -142,7 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME);
wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
dto.setSubstrateList(woPackagingBoxSubstrateList);
return dto;