CaiXiang/cigs4
1
0
Fork 0
程式碼 問題 合併請求 版本發布 Wiki 動態

Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

瀏覽代碼
This commit is contained in:
caixiang 2023-03-07 21:58:11 +08:00
當前提交 c284a4b394
共有 4 個檔案被更改，包括 20 行新增 和 11 行删除
顯示統計資料 下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java
查看文件

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

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
查看文件

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

15
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
查看文件

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

12
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
查看文件

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