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

fix

Browse Source
This commit is contained in:
闫阳
2023-02-23 18:51:03 +08:00
parent 5f409dfdf7
commit e8629b9ced
12 changed files with 141 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import java.util.List;
@@ -28,5 +29,7 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
void delete(Long[] ids);
List<WoPackagingBoxDTO> list();
WoPackagingBoxDTO printList(Long id);
}

7
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
View File

@@ -2,6 +2,7 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.ChangePackingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
@@ -27,10 +28,10 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
void removeSubstrate(Long id);
void insertSubstrate(WoPackagingBoxSubstrateDTO dto);
void insertSubstrate(ChangePackingBoxDTO dto);
void replaceSubstrate(WoPackagingBoxSubstrateDTO[] dtos);
void replaceSubstrate(ChangePackingBoxDTO[] dtos);
void batchInsert(WoPackagingBoxSubstrateDTO[] lists);
void insertSubstrateManual(ChangePackingBoxDTO dto);
}

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

@@ -27,5 +27,7 @@ public interface WoPackagingPrintHistoryServiceBiz extends CrudService<WoPackagi
void delete(Long[] ids);
List<WoPackagingPrintHistoryDTO> list();
void print(Long id);
}

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

@@ -12,9 +12,11 @@ import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPowerLevelDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,9 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
@Autowired
private WoPackagingBoxMapper mapper;
@Autowired
private WoPackagingBoxSubstrateMapper substrateMapper;
@Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@@ -109,5 +114,15 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
return list;
}
@Override
public WoPackagingBoxDTO printList(Long id) {
WoPackagingBox entity = baseDao.selectById(id);
WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
dto.setSubstrateList(woPackagingBoxSubstrateList);
return dto;
}
}

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

@@ -9,6 +9,7 @@ import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.packing.dto.ChangePackingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
@@ -38,6 +39,9 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired
private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
@Autowired
private WoPackagingBoxSubstrateMapper mapper;
@Override
public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){
String packagingBoxId = (String) params.get("packagingBoxId");
@@ -111,7 +115,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Override
@Transactional(rollbackFor = Exception.class)
public void insertSubstrate(WoPackagingBoxSubstrateDTO dto) {
public void insertSubstrate(ChangePackingBoxDTO dto) {
WoPackagingBoxSubstrate entity = baseDao.selectById(dto.getId());
//合箱写入包装箱拆合箱历史表
ChangePackagingBoxHistory changePackagingBoxHistory = new ChangePackagingBoxHistory();
@@ -129,14 +133,14 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Override
@Transactional(rollbackFor = Exception.class)
public void replaceSubstrate(WoPackagingBoxSubstrateDTO[] dtos) {
for(WoPackagingBoxSubstrateDTO dto : dtos){
public void replaceSubstrate(ChangePackingBoxDTO[] dtos) {
for(ChangePackingBoxDTO dto : dtos){
WoPackagingBoxSubstrate entity = baseDao.selectById(dto.getId());
//换箱写入包装箱拆合箱历史表
ChangePackagingBoxHistory changePackagingBoxHistory = new ChangePackagingBoxHistory();
changePackagingBoxHistory.setSubstrateId(dto.getWoSubstrateId());
changePackagingBoxHistory.setTargetBoxNo(entity.getPackagingBoxId());
changePackagingBoxHistory.setTargetSlot(entity.getSlot());
changePackagingBoxHistory.setSubstrateId(entity.getWoSubstrateId());
changePackagingBoxHistory.setSourceBoxNo(entity.getPackagingBoxId());
changePackagingBoxHistory.setSourceSlot(entity.getSlot());
changePackagingBoxHistory.setTargetBoxNo(dto.getPackagingBoxId());
changePackagingBoxHistory.setTargetSlot(dto.getSlot());
changePackagingBoxHistory.setType(3);
@@ -150,9 +154,18 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Override
@Transactional(rollbackFor = Exception.class)
public void batchInsert(WoPackagingBoxSubstrateDTO[] lists) {
for(WoPackagingBoxSubstrateDTO dto:lists){
if(dto.getWoSubstrateId()==null){
public void insertSubstrateManual(ChangePackingBoxDTO dto) {
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()),WoPackagingBoxSubstrate.WO_SUBSTRATE_ID,dto.getWoSubstrateId());
if(mapper.selectCount(wrapper)>0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
substrate.setPackagingBoxId(dto.getPackagingBoxId());
updateById(substrate);
}
else{
//模组ID有时为空，用户会输入”无码“
if(dto.getWoSubstrateId()==null) {
dto.setWoSubstrateId("无码");
}
//效验数据

33
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
View File

@@ -3,9 +3,14 @@ package com.cnbm.packing.service.impl;
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.enums.WhetherEnum;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
import com.cnbm.packing.entity.WoPackagingBox;
@@ -13,8 +18,10 @@ import com.cnbm.packing.entity.WoPackagingPrintHistory;
import com.cnbm.packing.entity.WoPackagingPrintHistory;
import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import com.cnbm.packing.service.WoPackagingPrintHistoryServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +43,9 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired
private WoPackagingPrintHistoryMapper mapper;
@Autowired
private WoPackagingBoxServiceBiz woPackagingBoxServiceBiz;
@Override
public QueryWrapper<WoPackagingPrintHistory> getWrapper(Map<String, Object> params){
LocalDateTime startTime = (LocalDateTime) params.get("startTime");
@@ -92,5 +102,28 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
return list;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void print(Long id) {
WoPackagingBoxDTO woPackagingBox = woPackagingBoxServiceBiz.get(id);
WoPackagingPrintHistory woPackagingPrintHistory = new WoPackagingPrintHistory();
BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
woPackagingPrintHistory.setId(null);
woPackagingPrintHistory.setPrintTime(LocalDateTime.now());
insert(woPackagingPrintHistory);
//更新包装箱表中打印状态和时间
woPackagingBox.setPrintTime(woPackagingPrintHistory.getPrintTime());
if(woPackagingBox.getPrintStatus()==0){
woPackagingBox.setPrintCount(1);
woPackagingBox.setPrintStatus(1);
}
else{
woPackagingBox.setPrintCount(woPackagingBox.getPrintCount()+1);
}
woPackagingBoxServiceBiz.update(woPackagingBox);
}
}