This commit is contained in:
闫阳 2023-03-03 09:51:54 +08:00
parent 8fa7a486fd
commit 2e72fb7df8
7 ha cambiato i file con 44 aggiunte e 37 eliminazioni

Vedi File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -33,8 +34,8 @@ import java.util.Map;
@Service
public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz {
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){
@ -71,7 +72,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
@Transactional(rollbackFor = Exception.class)
public void save(ChangePackagingBoxHistoryDTO dto) {
ChangePackagingBoxHistory entity = ConvertUtils.sourceToTarget(dto, ChangePackagingBoxHistory.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -79,7 +80,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
@Transactional(rollbackFor = Exception.class)
public void update(ChangePackagingBoxHistoryDTO dto) {
ChangePackagingBoxHistory entity = ConvertUtils.sourceToTarget(dto, ChangePackagingBoxHistory.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}

Vedi File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.admin.utils.CodeGeneratorHelper;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@ -32,8 +33,8 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Autowired
private PrintModelMapper mapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<PrintModel> getWrapper(Map<String, Object> params){
@ -72,7 +73,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Transactional(rollbackFor = Exception.class)
public void save(PrintModelDTO dto) {
PrintModel entity = ConvertUtils.sourceToTarget(dto, PrintModel.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -80,7 +81,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Transactional(rollbackFor = Exception.class)
public void update(PrintModelDTO dto) {
PrintModel entity = ConvertUtils.sourceToTarget(dto, PrintModel.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}

Vedi File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -35,8 +36,8 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Autowired
private WoCompensationPowerMapper mapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoCompensationPower> getWrapper(Map<String, Object> params){
@ -69,7 +70,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Transactional(rollbackFor = Exception.class)
public void save(WoCompensationPowerDTO dto) {
WoCompensationPower entity = ConvertUtils.sourceToTarget(dto, WoCompensationPower.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -77,7 +78,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Transactional(rollbackFor = Exception.class)
public void update(WoCompensationPowerDTO dto) {
WoCompensationPower entity = ConvertUtils.sourceToTarget(dto, WoCompensationPower.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}

Vedi File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -37,8 +38,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
private WoPackagingBoxMapper mapper;
@Autowired
private WoPackagingBoxSubstrateMapper substrateMapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@ -86,7 +87,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
@Transactional(rollbackFor = Exception.class)
public IdVo add(WoPackagingBoxDTO dto) {
WoPackagingBox entity = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
return IdVo.builder().id(entity.getId()).build();
}
@ -95,7 +96,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
@Transactional(rollbackFor = Exception.class)
public void update(WoPackagingBoxDTO dto) {
WoPackagingBox entity = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}

Vedi File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -42,8 +43,8 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
@Autowired
private WoPackagingBoxSubstrateMapper mapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){
@ -78,7 +79,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Transactional(rollbackFor = Exception.class)
public void save(WoPackagingBoxSubstrateDTO dto) {
WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -86,7 +87,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Transactional(rollbackFor = Exception.class)
public void update(WoPackagingBoxSubstrateDTO dto) {
WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
@ -108,7 +109,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
changePackagingBoxHistory.setSourceSlot(entity.getSlot());
changePackagingBoxHistory.setLeaveTime(LocalDateTime.now());
changePackagingBoxHistory.setType(2);
baseSupport.setCommonField(changePackagingBoxHistory);
BaseSupportUtils.setCommonField(changePackagingBoxHistory);
changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
//模组从该包装箱中移出该模组变为未绑定BoxID的模组
UpdateWrapper<WoPackagingBoxSubstrate> wrapper = new UpdateWrapper<>();
@ -132,12 +133,12 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
changePackagingBoxHistory.setTargetSlot(dto.getSlot());
changePackagingBoxHistory.setInputTime(LocalDateTime.now());
changePackagingBoxHistory.setType(1);
baseSupport.setCommonField(changePackagingBoxHistory);
BaseSupportUtils.setCommonField(changePackagingBoxHistory);
changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
//更新
entity.setPackagingBoxId(dto.getPackagingBoxId());
entity.setSlot(dto.getSlot());
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
@ -154,12 +155,12 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
changePackagingBoxHistory.setTargetBoxNo(dto.getPackagingBoxId());
changePackagingBoxHistory.setTargetSlot(dto.getSlot());
changePackagingBoxHistory.setType(3);
baseSupport.setCommonField(changePackagingBoxHistory);
BaseSupportUtils.setCommonField(changePackagingBoxHistory);
changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
//更新
entity.setPackagingBoxId(dto.getPackagingBoxId());
entity.setSlot(dto.getSlot());
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
}
@ -173,7 +174,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
if (mapper.selectCount(wrapper) > 0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
substrate.setPackagingBoxId(dto.getPackagingBoxId());
baseSupport.setUpdateCommonField(substrate);
BaseSupportUtils.setUpdateCommonField(substrate);
updateById(substrate);
} else {
//模组ID有时为空用户会输入无码
@ -183,7 +184,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
}

Vedi File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.enums.WhetherEnum;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -43,8 +44,8 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired
private WoPackagingPrintHistoryMapper mapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Autowired
private WoPackagingBoxServiceBiz woPackagingBoxServiceBiz;
@ -81,7 +82,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Transactional(rollbackFor = Exception.class)
public void save(WoPackagingPrintHistoryDTO dto) {
WoPackagingPrintHistory entity = ConvertUtils.sourceToTarget(dto, WoPackagingPrintHistory.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -89,7 +90,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Transactional(rollbackFor = Exception.class)
public void update(WoPackagingPrintHistoryDTO dto) {
WoPackagingPrintHistory entity = ConvertUtils.sourceToTarget(dto, WoPackagingPrintHistory.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
@ -117,7 +118,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
woPackagingPrintHistory.setId(null);
woPackagingPrintHistory.setPrintTime(LocalDateTime.now());
baseSupport.setCommonField(woPackagingPrintHistory);
BaseSupportUtils.setCommonField(woPackagingPrintHistory);
insert(woPackagingPrintHistory);
//更新包装箱表中打印状态和时间
woPackagingBox.setPrintTime(woPackagingPrintHistory.getPrintTime());
@ -128,7 +129,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
else{
woPackagingBox.setPrintCount(woPackagingBox.getPrintCount()+1);
}
baseSupport.setUpdateCommonField(woPackagingBox);
BaseSupportUtils.setUpdateCommonField(woPackagingBox);
woPackagingBoxServiceBiz.update(woPackagingBox);
}

Vedi File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
@ -32,8 +33,8 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Autowired
private WoPowerLevelMapper mapper;
@Autowired
private BaseSupport baseSupport;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoPowerLevel> getWrapper(Map<String, Object> params){
@ -67,7 +68,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Transactional(rollbackFor = Exception.class)
public void save(WoPowerLevelDTO dto) {
WoPowerLevel entity = ConvertUtils.sourceToTarget(dto, WoPowerLevel.class);
baseSupport.setCommonField(entity);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@ -75,7 +76,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Transactional(rollbackFor = Exception.class)
public void update(WoPowerLevelDTO dto) {
WoPowerLevel entity = ConvertUtils.sourceToTarget(dto, WoPowerLevel.class);
baseSupport.setUpdateCommonField(entity);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}