root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2025-03-22 09:47:09 +08:00
parent 89a73a1715 d1496fb22f
commit 62d64ac107
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -26,11 +26,11 @@ import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
import org.nl.b_lms.sch.point.dao.StIvtCoolregionio;
import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
@@ -59,7 +59,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -75,6 +74,8 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocati
@Service
public class SlitterServiceImpl implements SlitterService {
@Autowired
private BstIvtStockingivtMapper bstIvtStockingivtMapper;
@Autowired
private IschBaseTaskService taskService;
@Autowired
@@ -92,8 +93,6 @@ public class SlitterServiceImpl implements SlitterService {
@Autowired
private SlitterDownTrussTask slitterDownTrussTask;
@Autowired
private SendCopperFoilSubRollTrussTask sendCopperFoilSubRollTrussTask;
@Autowired
private RedissonClient redissonClient;
@Autowired
private TrussCallShaftCacheTask trussCallShaftCacheTask;
@@ -1548,6 +1547,20 @@ public class SlitterServiceImpl implements SlitterService {
if (ObjectUtil.isEmpty(pointByCode)) {
throw new BadRequestException("点位 [" + pointCode + "] 不存在或者已被禁用！");
}
if (ObjectUtil.isEmpty(vehicleCode)) {
throw new BadRequestException("托盘信息不能为空！");
}
if(!vehicleCode.contains("GX")){
throw new BadRequestException("请扫描或输入正确的托盘码！");
}
LambdaQueryWrapper<BstIvtStockingivt> lam = new LambdaQueryWrapper<>();
lam.eq(BstIvtStockingivt::getVehicle_code, vehicleCode)
.eq(BstIvtStockingivt::getIs_used, SlitterConstant.SLITTER_YES);
BstIvtStockingivt old = bstIvtStockingivtMapper.selectOne(lam);
if(ObjectUtil.isNotEmpty(old)){
throw new BadRequestException("当前托盘:"+vehicleCode+"已绑定在点位:"+old.getPoint_code()+"上,不允许重复绑定！");
}
pointByCode.setVehicle_code(vehicleCode);
pointByCode.setIvt_status("1");
TaskUtils.updateOptMessageByBStockingPoint(pointByCode);