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

fix

Browse Source
This commit is contained in:
psh
2023-12-26 16:37:13 +08:00
parent f844c23b35
commit 4e3c8f5e57
9 changed files with 564 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -213,6 +213,7 @@ public abstract class AbstractTask {
task.setCreate_mode(param.getString("create_mode"));
task.setVehicle_code(param.getString("vehicle_code"));
task.setVehicle_qty(param.getInteger("vehicle_qty"));
task.setVehicle_type(param.getString("material_type"));
task.setTask_status(TaskStatus.APPLY.getCode());
task.setWorkshop_code(taskConfig.getWorkshop_code()); // 车间编码
// 设置起/终点

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java
View File

@@ -116,7 +116,7 @@ public class BPSLTask extends AbstractTask {
String regionCode = "";
String materialType = extGroupData.getString("material_type");
if("1".equals(materialType)){
regionCode="HCQ4";
regionCode="ZJBDDW";
}else if("2".equals(materialType)){
regionCode="HCQ2";
}else if ("3".equals(materialType)){

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
View File

@@ -76,7 +76,7 @@ public class KGHJRKTask extends AbstractTask {
// 找终点
SchBasePoint startPoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getPoint_code, task.getPoint_code1()));
SchBasePoint point = findNextPoint(startPoint);
SchBasePoint point = findNextPoint(startPoint,task.getVehicle_type());
if (ObjectUtil.isEmpty(point)) {
task.setRemark("未找到所需点位!");
taskService.update(task);
@@ -104,12 +104,16 @@ public class KGHJRKTask extends AbstractTask {
* 1.A区的去A区缓存点,B区的去B区
* 2.倒叙查找，找到满足当前位置数量不足3的即可
*/
private SchBasePoint findNextPoint(SchBasePoint startPoint) {
private SchBasePoint findNextPoint(SchBasePoint startPoint,String vehicleType) {
String regionCode = null;
if ("A1".equals(startPoint.getWorkshop_code())) {
//A1空架到HCQ1
regionCode = "HCQ1";
if("1".equals(vehicleType)){
regionCode="ZJBKGHJDJW";
}
} else if ("A2".equals(startPoint.getWorkshop_code())) {
//A1空架到KGHJ2
regionCode = "KGHJ2";