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

fix:分切下料修改

Browse Source
This commit is contained in:
ls
2025-03-04 14:27:13 +08:00
parent 50f112d16a
commit bd625244b6
6 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,9 +473,19 @@ public class NbjPdaServiceImpl implements NbjPdaService {
}
if (message.containsKey(startPointCode) && !endPoint.getPlan().equals(message.get(startPointCode))) {
throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与分切机不匹配！");
} else {
if (endPoint.getPlan().equals("1")){
taskParam.put("point_code1", startPoint.getPoint_code()+"_C");
}
if (endPoint.getPlan().equals("2")){
taskParam.put("point_code1", startPoint.getPoint_code()+"_D");
}
}
}

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -69,11 +70,15 @@ public class OtherPdaServiceImpl implements OtherPdaService {
// 只做保存任务
// point_code
String pointCode = param.getString("point_code");
String startPoint = param.getString("start_point");
List<SchBaseTask> schBaseTasks = taskService.checkHaveTask(pointCode);
if (schBaseTasks.size() > 0) {
throw new BadRequestException("点位[" + pointCode + "]已经存在任务！");
}
JSONObject taskParam = new JSONObject();
if (StrUtil.isNotEmpty(startPoint)){
taskParam.put("point_code1", startPoint);
}
taskParam.put("point_code2", pointCode);
taskParam.put("index_task", 1);
taskParam.put("config_code", "SendWasteFoilAGVTask");

6
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
View File

@@ -75,4 +75,10 @@ public class SchBasePointController {
schBasePointService.changeLock(points);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/getWastePointList")
@Log("获取区域下拉框")
public ResponseEntity<Object> getWastePointList(){
return new ResponseEntity<>(schBasePointService.getWastePointList(),HttpStatus.OK);
}
}

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
View File

@@ -127,4 +127,6 @@ public interface ISchBasePointService extends IService<SchBasePoint> {
List<SchBasePoint> getAllBusinessTaskPoint(String area, String region, String pointType,
String pointStatus, String vehicleType, String vehicleCode);
List<SchBasePoint> getWastePointList();
}

18
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.sch.point.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -26,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -106,7 +104,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
String point_code = entity.getPoint_code();
SchBasePoint pointObj = pointMapper.selectById(point_code);
if (ObjectUtil.isNotEmpty(pointObj) && !pointObj.getPoint_code().equals(entity.getPoint_code())) {
throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getPoint_code()));
throw new BadRequestException(LangProcess.msg("error_ParamExist", entity.getPoint_code()));
}
// 默认父类点位为自身
@@ -241,10 +239,18 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
@Override
public List<SchBasePoint> getAllBusinessTaskPoint(String area, String region, String pointType,
String pointStatus, String vehicleType, String vehicleCode) {
String pointStatus, String vehicleType, String vehicleCode) {
return pointMapper.getAllBusinessTaskPoint(area, region, pointType, pointStatus, vehicleType, vehicleCode);
}
@Override
public List<SchBasePoint> getWastePointList() {
List<SchBasePoint> list = getAllBusinessNotTaskPoint("A1", "A1-FB", null, "1", null, null);
return list.stream().filter(item -> item.getPoint_code().contains("ZD") || item.getPoint_code().contains("QD") ).collect(Collectors.toList());
}
@Override
public List<SchBasePoint> getWindRollConformRawNotTaskPoints(String code) {
return pointMapper.getWindRollConformRawNotTaskPoints(code);

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

@@ -142,7 +142,14 @@ public class SlitterDownAGVTask extends AbstractTask {
for (BstIvtCutpointivt bstIvtCutpointivt : areaEmptyNotTaskPoint) {
if (message.containsKey(bstIvtCutpointivt.getPoint_code())){
if ( bstIvtCutpointivt.getPlan().equals(message.get(bstIvtCutpointivt.getPoint_code()))) {
endPoint = bstIvtCutpointivt;
if (endPoint.getPlan().equals("1")){
endPoint.setPoint_code(endPoint.getPoint_code()+"_C");
}
if (endPoint.getPlan().equals("2")){
endPoint.setPoint_code(endPoint.getPoint_code()+"_D");
}
} else {
throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与分切机不匹配！");
}