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

Compare commits

base: CaiXiang:3b7cc6769023e19a302a396b30fa102b032214c6
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:c9ddb770e1fbd3620b2432efd433fcdad7400af9
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "3b7cc6769023e19a302a396b30fa102b032214c6" and "c9ddb770e1fbd3620b2432efd433fcdad7400af9" have entirely different histories.
3b7cc67690 ... c9ddb770e1

4 changed files with 11 additions and 20 deletions
Show Stats 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, false), getPage(params, ChangePackagingBoxHistory.CREATE_TIME, true),
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.CREATE_TIME, false), getPage(params, PrintModel.ID, true),
getWrapper(params) getWrapper(params)
); );
return getPageData(page, PrintModelDTO.class); return getPageData(page, PrintModelDTO.class);

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

@ -176,15 +176,12 @@ 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是否非空 substrate.setPackagingBoxId(box.getBoxNo());
if(!StringUtils.isBlank(substrate.getWoSubstrateId())) { substrate.setPowerLevel(box.getPowerLevel());
substrate.setPackagingBoxId(box.getBoxNo()); substrate.setSapMaterial(box.getSapMaterial());
substrate.setPowerLevel(box.getPowerLevel()); substrate.setLineBody(box.getLineBody());
substrate.setSapMaterial(box.getSapMaterial()); BaseSupportUtils.setCommonField(substrate);
substrate.setLineBody(box.getLineBody()); woPackagingBoxSubstrateServiceBiz.insert(substrate);
BaseSupportUtils.setCommonField(substrate);
woPackagingBoxSubstrateServiceBiz.insert(substrate);
}
} }
return IdVo.builder().id(box.getId()).build(); return IdVo.builder().id(box.getId()).build();
} }

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

@ -194,15 +194,9 @@ 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是否非空 WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
if(StringUtils.isBlank(dto.getWoSubstrateId())) { BaseSupportUtils.setUpdateCommonField(entity);
deleteById(dto.getId()); updateById(entity);
}
else {
WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
} }
} }