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

fix:二期发货AGV改为NDC调度对应逻辑修改

Browse Source
This commit is contained in:
zhouz
2026-07-31 10:53:39 +08:00
parent 75a6265f97
commit 98df229655
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
View File

@@ -36,8 +36,8 @@
AND point.region_id= #{region_id} AND point.region_id= #{region_id}
</if> </if>
<if test="sale_order_name != null and sale_order_name != ''"> <if test="box_type != null and box_type != ''">
AND sub.sale_order_name= #{sale_order_name} AND sub.box_type= #{box_type}
</if> </if>
GROUP BY point.row_num GROUP BY point.row_num

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
View File

@@ -99,7 +99,7 @@ public class TwoSendOutTask extends AbstractAcsTask {
.vehicle_code(json.getString("vehicle_code")) .vehicle_code(json.getString("vehicle_code"))
.priority(json.getString("priority")) .priority(json.getString("priority"))
.class_type(json.getString("task_type")) .class_type(json.getString("task_type"))
.agv_system_type("3") .agv_system_type(PackageInfoIvtEnum.AGV_SYSTEM_TYPE.code("2楼1区域AGV系统"))
.agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配")) .agv_action_type(PackageInfoIvtEnum.AGV_ACTION_TYPE.code("放货二次分配"))
.dtl_type(String.valueOf(dtl_type)) .dtl_type(String.valueOf(dtl_type))
.route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .route_plan_code(getRoutePlanCode(json.getString("point_code1")))
@@ -199,6 +199,7 @@ public class TwoSendOutTask extends AbstractAcsTask {
json.put("point_code2", form.getString("point_code2")); json.put("point_code2", form.getString("point_code2"));
json.put("point_code4", form.getString("point_code4")); json.put("point_code4", form.getString("point_code4"));
json.put("vehicle_code", form.getString("vehicle_code")); json.put("vehicle_code", form.getString("vehicle_code"));
json.put("acs_task_type", "3");
json.put("handle_class", THIS_CLASS); json.put("handle_class", THIS_CLASS);
json.put("create_id", SecurityUtils.getCurrentUserId()); json.put("create_id", SecurityUtils.getCurrentUserId());
json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_name", SecurityUtils.getCurrentUsername());

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

@@ -47,7 +47,11 @@ public class AcsUtil {
product_area = "LK"; product_area = "LK";
} }
if (jo.containsKey("class_type") && jo.getString("class_type").contains("0107")) { if (jo.containsKey("class_type") && jo.getString("class_type").contains("0107")) {
product_area = "BLK"; if (jo.getString("class_type").equals("010708")){
product_area = "B1";
}else {
product_area = "BLK";
}
} }
if (StrUtil.isEmpty(product_area)) { if (StrUtil.isEmpty(product_area)) {
log.warn("区域不能为空!下发信息：" + jo.toString()); log.warn("区域不能为空!下发信息：" + jo.toString());