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

代码更新

Browse Source
This commit is contained in:
liyongde
2023-02-02 11:17:26 +08:00
parent 01fa735c4e
commit cfe9039386
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -198,7 +198,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); taskTab.update(taskObj);
} }
return; continue;
} }
JSONObject param1 = new JSONObject(); JSONObject param1 = new JSONObject();
param1.put("flag", "1"); param1.put("flag", "1");
@@ -221,6 +221,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
taskObj.put("remark", "相应列有AGV在工作,等待执行!"); taskObj.put("remark", "相应列有AGV在工作,等待执行!");
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj); taskTab.update(taskObj);
continue;
} }
} }
} }
@@ -233,7 +234,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
if (col_num != 1) { if (col_num != 1) {
// 因为找到的是对应相同的物料点，所以是下一个位置 // 因为找到的是对应相同的物料点，所以是下一个位置
JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "' JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "'
// if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
taskObj.put("point_code2", firstRow.getString("point_code")); taskObj.put("point_code2", firstRow.getString("point_code"));
taskObj.put("update_time", DateUtil.now()); taskObj.put("update_time", DateUtil.now());
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
@@ -243,7 +244,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
JSONObject point = new JSONObject(); JSONObject point = new JSONObject();
point.put("lock_type", "2"); point.put("lock_type", "2");
pointTab.update(point, "point_code = '" + firstRow.getString("point_code") + "'"); pointTab.update(point, "point_code = '" + firstRow.getString("point_code") + "'");
return; continue;
// JSONObject point = new JSONObject(); // JSONObject point = new JSONObject();
// point.put("lock_type", "2"); // point.put("lock_type", "2");
// point.put("task_id", taskObj.getString("task_id")); // point.put("task_id", taskObj.getString("task_id"));

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
View File

@@ -67,7 +67,8 @@
OPTION 输入.vehicle_type <> "" OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like "%" 输入.vehicle_type "%" p.can_vehicle_type like "%" 输入.vehicle_type "%"
ENDOPTION ENDOPTION
AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1') AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1'
AND p2.col_num = (SELECT MIN(p3.col_num) FROM SCH_BASE_Point p3 WHERE p3.block_num = p2.block_num AND p3.row_num = p2.row_num AND p3.is_used = '1' AND p3.is_delete = '0'))
ORDER BY block_num,row_num,col_num ORDER BY block_num,row_num,col_num
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY