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

add: 新增发货区木箱堆叠功能

Browse Source
This commit is contained in:
liuxy
2023-05-10 13:45:19 +08:00
parent 5af9c6d6e8
commit 52bb862862
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -474,8 +474,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject point_jo = rowArr.getJSONObject(i);
JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
// TODO pointArr.size() == 8
if (pointArr.size() == 4) {
if (pointArr.size() == 8) {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0);
point_code = jsonNewRow.getString("point_code");
break;
@@ -515,8 +514,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject point_jo = rowArr.getJSONObject(i);
JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0);
// TODO pointArr.size() == 8
if (pointArr.size() == 4) {
if (pointArr.size() == 8) {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0);
point_code = jsonNewRow.getString("point_code");
break;

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
View File

@@ -61,16 +61,13 @@ public class SendOutTask extends AbstractAcsTask {
.task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
// TODO .next_device_code(jsonPoint.getString("device_code"))
.next_device_code(json.getString("point_code2"))
.next_device_code(jsonPoint.getString("device_code"))
.agv_system_type("1")
.vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority"))
.remark(json.getString("remark"))
// TODO 暂时不上线
// .start_height(start_high)
// .next_height(next_high)
.start_height(start_high)
.next_height(next_high)
.build();
resultList.add(dto);
System.out.println(resultList.toString());