diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yzjCallMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yzjCallMaterial_01.wql index 5015f7e..efa15e2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yzjCallMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yzjCallMaterial_01.wql @@ -67,7 +67,6 @@ OPTION 输入.vehicle_type <> "" p.can_vehicle_type like 输入.vehicle_type ENDOPTION - ORDER BY col_num desc,row_num,layer_num ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YzjSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YzjSendEmpVehicleTask.java index 663b92e..7dc1995 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YzjSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YzjSendEmpVehicleTask.java @@ -25,7 +25,7 @@ import java.util.List; /** * @author: lyd - * @description: 压制机送空托盘入库 + * @description: 压制机送空盅入库 * @Date: 2022/11/10 */ @Service @@ -149,7 +149,7 @@ public class YzjSendEmpVehicleTask extends AbstractAcsTask { SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") - .task_name("压制机空盘入库") + .task_name("压制机空盅入库") .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) .vehicle_code(form.getString("vehicle_code")) @@ -187,7 +187,7 @@ public class YzjSendEmpVehicleTask extends AbstractAcsTask { param1.put("region_code", "KLHJ"); param1.put("vehicle_type", "%" + vehicle_type + "%"); //1、查找困料货架是否有空位,将空桶送过去,由于一个货架只放一个,不需要判定,有空位即可放 - JSONObject endPoint = WQL.getWO("QSCH_hnSendEmptyVehicle_01").addParamMap(param1).process().uniqueResult(0); + JSONObject endPoint = WQL.getWO("QSCH_yzjSendEmptyVehicle_01").addParamMap(param1).process().uniqueResult(0); if (ObjectUtil.isEmpty(endPoint)) { taskObj.put("remark", "困料货架无可用货位!"); taskObj.put("task_status", TaskStatusEnum.SURE_START.getCode());