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

Merge pull request 'yanyang' (#21) from yanyang into master

Browse Source 
Reviewed-on: #21
This commit is contained in:
闫阳 2023-03-07 20:21:17 +08:00
commit 3b7cc67690
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
@Override @Override
public PageData<ChangePackagingBoxHistoryDTO> page (Map<String, Object> params){ public PageData<ChangePackagingBoxHistoryDTO> page (Map<String, Object> params){
IPage<ChangePackagingBoxHistory> page = baseDao.selectPage( IPage<ChangePackagingBoxHistory> page = baseDao.selectPage(
getPage(params, ChangePackagingBoxHistory.CREATE_TIME, true), getPage(params, ChangePackagingBoxHistory.CREATE_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, ChangePackagingBoxHistoryDTO.class); return getPageData(page, ChangePackagingBoxHistoryDTO.class);

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

@ -58,7 +58,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Override @Override
public PageData<PrintModelDTO> page (Map<String, Object> params){ public PageData<PrintModelDTO> page (Map<String, Object> params){
IPage<PrintModel> page = baseDao.selectPage( IPage<PrintModel> page = baseDao.selectPage(
getPage(params, PrintModel.ID, true), getPage(params, PrintModel.CREATE_TIME, false),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, PrintModelDTO.class); return getPageData(page, PrintModelDTO.class);

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

@ -176,6 +176,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
//新增模组 //新增模组
List<WoPackagingBoxSubstrate> substrateList = dto.getSubstrateList(); List<WoPackagingBoxSubstrate> substrateList = dto.getSubstrateList();
for(WoPackagingBoxSubstrate substrate : substrateList){ for(WoPackagingBoxSubstrate substrate : substrateList){
//判断模组id是否非空
if(!StringUtils.isBlank(substrate.getWoSubstrateId())) {
substrate.setPackagingBoxId(box.getBoxNo()); substrate.setPackagingBoxId(box.getBoxNo());
substrate.setPowerLevel(box.getPowerLevel()); substrate.setPowerLevel(box.getPowerLevel());
substrate.setSapMaterial(box.getSapMaterial()); substrate.setSapMaterial(box.getSapMaterial());
@ -183,6 +185,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
BaseSupportUtils.setCommonField(substrate); BaseSupportUtils.setCommonField(substrate);
woPackagingBoxSubstrateServiceBiz.insert(substrate); woPackagingBoxSubstrateServiceBiz.insert(substrate);
} }
}
return IdVo.builder().id(box.getId()).build(); return IdVo.builder().id(box.getId()).build();
} }

6
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@ -194,11 +194,17 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateSubstrateManual(ChangePackingBoxDTO[] dtos) { public void updateSubstrateManual(ChangePackingBoxDTO[] dtos) {
for(ChangePackingBoxDTO dto : dtos) { for(ChangePackingBoxDTO dto : dtos) {
//判断模组id是否非空
if(StringUtils.isBlank(dto.getWoSubstrateId())) {
deleteById(dto.getId());
}
else {
WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class); WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
BaseSupportUtils.setUpdateCommonField(entity); BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity); updateById(entity);
} }
} }
}
@Override @Override
public List<WoPackagingBoxSubstrateDTO> substrateList(String woSubstrateId) { public List<WoPackagingBoxSubstrateDTO> substrateList(String woSubstrateId) {