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

fix: 测试修改

Browse Source
This commit is contained in:
liyongde
2024-09-13 17:32:38 +08:00
parent 2cd4d91cbc
commit 4702dcf5a8
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java
View File

@@ -22,6 +22,8 @@ import org.nl.wms.pdm.ivt.bcut.service.IBstIvtCutpointivtService;
import org.nl.wms.pdm.ivt.bcut.service.dao.BstIvtCutpointivt; import org.nl.wms.pdm.ivt.bcut.service.dao.BstIvtCutpointivt;
import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt; import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt;
import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService; import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition; import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition;
@@ -62,6 +64,8 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
@Autowired @Autowired
private WmsToAcsService wmsToAcsService; private WmsToAcsService wmsToAcsService;
@Autowired @Autowired
private ISchBasePointService pointService;
@Autowired
private SlitterSendRollAGVTask slitterSendRollAGVTask; private SlitterSendRollAGVTask slitterSendRollAGVTask;
@Autowired @Autowired
private IstIvtCutpointivtService cutpointivtService; private IstIvtCutpointivtService cutpointivtService;
@@ -98,7 +102,11 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
Stream.of(zcPoint, pointCode).collect(Collectors.toList())); Stream.of(zcPoint, pointCode).collect(Collectors.toList()));
// 判断是否呼叫过任务 // 判断是否呼叫过任务
if (isTask) { if (isTask) {
throw new BadRequestException("点位[" + pointCode + "]已经创建过任务！"); throw new BadRequestException("点位[" + pointCode + "、" + zcPoint + "]已经创建过任务！");
}
SchBasePoint zcPointObj = pointService.getById(zcPoint);
if (ObjectUtil.isEmpty(zcPointObj.getMaterial_code())) {
throw new BadRequestException("点位不存在该母卷或者该母卷已搬运");
} }
StIvtCutpointivt cutPoint = cutpointivtService.getOneByCode(pointCode); StIvtCutpointivt cutPoint = cutpointivtService.getOneByCode(pointCode);
param.put("config_code", "SlitterUpTrussTask"); param.put("config_code", "SlitterUpTrussTask");
@@ -323,7 +331,7 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
if (StrUtil.isEmpty(device_code)) { if (StrUtil.isEmpty(device_code)) {
throw new BadRequestException("输入的设备号不能为空！"); throw new BadRequestException("输入的设备号不能为空！");
} }
StIvtCutpointivt device = cutpointivtService.getOneByCode(device_code); StIvtCutpointivt device = cutpointivtService.getPintByExtCode(device_code, false);
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
JSONObject p1 = new JSONObject(); JSONObject p1 = new JSONObject();
p1.put("text", device.getPoint_code() + "上轴位"); p1.put("text", device.getPoint_code() + "上轴位");

5
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java
View File

@@ -126,6 +126,11 @@ public class NbjPdaServiceImpl implements NbjPdaService {
if (schBaseTasks.size() > 0) { if (schBaseTasks.size() > 0) {
throw new BadRequestException("该点位已经创建过任务！"); throw new BadRequestException("该点位已经创建过任务！");
} }
// 判断子卷是否存在
PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
if (ObjectUtil.isEmpty(plan)) {
throw new BadRequestException("子卷[" + containerName + "]的分切计划不存在！");
}
SchBasePoint startPoint = pointService.getById(pointCode); SchBasePoint startPoint = pointService.getById(pointCode);
startPoint.setPoint_status("3"); startPoint.setPoint_status("3");
// 子卷号 // 子卷号