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
2024-06-05 16:41:24 +08:00
parent 5a47d7fe94
commit 9b719b50a7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,8 +144,8 @@ public class MJXLTask extends AbstractTask {
if ((ObjectUtil.isEmpty(schBasePoint.getVehicle_type()) || if ((ObjectUtil.isEmpty(schBasePoint.getVehicle_type()) ||
materialType.equals(schBasePoint.getVehicle_type())) materialType.equals(schBasePoint.getVehicle_type()))
&& "2".equals(schBasePoint.getPoint_status()) && "2".equals(schBasePoint.getPoint_status())
&& schBasePoint.getVehicle_qty() < 3 && schBasePoint.getVehicle_qty() < 3) {
&& (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) { // && (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) {
//新增逻辑，同一列只能放相同物料 //新增逻辑，同一列只能放相同物料
boolean flag=true; boolean flag=true;
List<String> list=new ArrayList<>(); List<String> list=new ArrayList<>();

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

@@ -158,6 +158,10 @@ public class TBXBKJTask extends AbstractTask {
if(task.getTask_code().equals(schBasePoint.getIng_task_code())){ if(task.getTask_code().equals(schBasePoint.getIng_task_code())){
return schBasePoint; return schBasePoint;
} }
if(ObjectUtil.isNotEmpty(schBasePoint.getIng_task_code())){
log.error("当前点位存在其他任务{},暂不执行",schBasePoint.getIng_task_code());
return null;
}
if (schBasePoint.getVehicle_qty() > 0 && if (schBasePoint.getVehicle_qty() > 0 &&
(ObjectUtil.isEmpty(schBasePoint.getIng_task_code()))) { (ObjectUtil.isEmpty(schBasePoint.getIng_task_code()))) {
if (temp == null || if (temp == null ||