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

add:长短轴绑定问题

Browse Source
This commit is contained in:
ls
2025-03-20 17:53:05 +08:00
parent 6f3a02a55b
commit e38fcb7b88
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
View File

@@ -30,8 +30,7 @@
SELECT point_code AS device_code, SELECT point_code AS device_code,
product_area product_area
FROM st_ivt_hotpointivt ivt FROM st_ivt_hotpointivt ivt
WHERE is_used = '1' WHERE ivt.product_area = #{productArea}
AND ivt.product_area = #{productArea}
</select> </select>
<select id="getNeedBakingPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt"> <select id="getNeedBakingPoint" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
SELECT hot.* SELECT hot.*

9
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/quartz/AutoMoveWasteFoilAGVTask.java
View File

@@ -36,19 +36,20 @@ public class AutoMoveWasteFoilAGVTask {
private ISchBasePointService pointService; private ISchBasePointService pointService;
public void run() { public void run() {
log.info("自动巡航废箔任务开始执行..."); log.info("自动巡航废箔任务开始执行...");
//自动巡航只有耳波
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
List<SchBasePoint> fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB", List<SchBasePoint> fbPoints = pointService.getAllBusinessNotTaskPoint("A1", "A1-FB",
"2", "1", null, null); "2", "1", null, null);
// 筛选一号位 // 筛选一号位
List<SchBasePoint> fbPointsFilter = fbPoints.stream() List<SchBasePoint> fbPointsfFilter = fbPoints.stream()
.filter(point -> point.getSort()!= null) .filter(point -> point.getSort()!= null)
.filter(point -> point.getSort() .equals(1)).collect(Collectors.toList()); .filter(point -> point.getSort() .equals(1)).collect(Collectors.toList());
if (CollUtil.isEmpty(fbPointsFilter)) { if (CollUtil.isEmpty(fbPointsfFilter)) {
log.info("自动巡航废箔任务执行异常，无废箔位"); log.info("自动巡航废箔任务执行异常，无废箔位");
return; return;
} }
jsonObject.put("point_code", fbPointsFilter.get(0).getPoint_code()); jsonObject.put("point_code", fbPointsfFilter.get(0).getPoint_code());
jsonObject.put("vehicle_type", "1");
otherPdaService.startMoveWasteFoilV2(jsonObject); otherPdaService.startMoveWasteFoilV2(jsonObject);
} }

4
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/PdaSendShaftAGVTask.java
View File

@@ -98,6 +98,10 @@ public class PdaSendShaftAGVTask extends AbstractTask {
String endPointCode = taskObj.getPoint_code2(); String endPointCode = taskObj.getPoint_code2();
String startPointCode = taskObj.getPoint_code1(); String startPointCode = taskObj.getPoint_code1();
StIvtCutpointivt endPoint = stIvtCutpointivtService.getOneByCode(endPointCode); StIvtCutpointivt endPoint = stIvtCutpointivtService.getOneByCode(endPointCode);
//长短轴需要截取
if (startPointCode.contains("_C") || startPointCode.contains("_D")){
startPointCode = startPointCode.substring(0,9);
}
BstIvtCutpointivt startPoint = bcutpointivtService.getPintByAgvCode(startPointCode, false); BstIvtCutpointivt startPoint = bcutpointivtService.getPintByAgvCode(startPointCode, false);
//起点点位清空 //起点点位清空
startPoint.setQzz_no1(""); startPoint.setQzz_no1("");

4
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
View File

@@ -173,6 +173,10 @@ public class SlitterDownAGVTask extends AbstractTask {
List<PdmBiSlittingproductionplan> list = slittingproductionplanService.getByQzzNos(qzzNo, "06"); List<PdmBiSlittingproductionplan> list = slittingproductionplanService.getByQzzNos(qzzNo, "06");
// 终点设置数据 // 终点设置数据
String endPointCode = taskObj.getPoint_code2(); String endPointCode = taskObj.getPoint_code2();
//长短轴需要截取
if (endPointCode.contains("_C") || endPointCode.contains("_D")){
endPointCode = endPointCode.substring(0,9);
}
BstIvtCutpointivt endPoint = bstIvtCutpointivtService.getPintByAgvCode(endPointCode, false); BstIvtCutpointivt endPoint = bstIvtCutpointivtService.getPintByAgvCode(endPointCode, false);
endPoint.setQzz_no1(taskObj.getVehicle_code()); endPoint.setQzz_no1(taskObj.getVehicle_code());
endPoint.setQzz_no2(taskObj.getVehicle_code2()); endPoint.setQzz_no2(taskObj.getVehicle_code2());