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

代码更新

Browse Source
This commit is contained in:
lyd
2022-11-16 18:23:14 +08:00
parent 604dce7b25
commit 66fee23c65
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yzjCallMaterial_01.wql
View File

@@ -67,7 +67,6 @@
OPTION 输入.vehicle_type <> "" OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like 输入.vehicle_type p.can_vehicle_type like 输入.vehicle_type
ENDOPTION ENDOPTION
ORDER BY col_num desc,row_num,layer_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

6
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YzjSendEmpVehicleTask.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
/** /**
* @author: lyd * @author: lyd
* @description: 压制机送空托盘入库 * @description: 压制机送空盅入库
* @Date: 2022/11/10 * @Date: 2022/11/10
*/ */
@Service @Service
@@ -149,7 +149,7 @@ public class YzjSendEmpVehicleTask extends AbstractAcsTask {
SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE")) .task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("") .task_type("")
.task_name("压制机空盘入库") .task_name("压制机空盅入库")
.task_status(TaskStatusEnum.SURE_START.getCode()) .task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1) .point_code1(point_code1)
.vehicle_code(form.getString("vehicle_code")) .vehicle_code(form.getString("vehicle_code"))
@@ -187,7 +187,7 @@ public class YzjSendEmpVehicleTask extends AbstractAcsTask {
param1.put("region_code", "KLHJ"); param1.put("region_code", "KLHJ");
param1.put("vehicle_type", "%" + vehicle_type + "%"); param1.put("vehicle_type", "%" + vehicle_type + "%");
//1、查找困料货架是否有空位，将空桶送过去，由于一个货架只放一个，不需要判定，有空位即可放 //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)) { if (ObjectUtil.isEmpty(endPoint)) {
taskObj.put("remark", "困料货架无可用货位!"); taskObj.put("remark", "困料货架无可用货位!");
taskObj.put("task_status", TaskStatusEnum.SURE_START.getCode()); taskObj.put("task_status", TaskStatusEnum.SURE_START.getCode());