From 8d01750f8fbfa6841229a03294642798842238a6 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 14 Aug 2023 10:13:23 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E6=96=B0=E5=A2=9E=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=BA=BF=E5=85=A5=E5=BA=93=E7=AB=8B=E5=BA=93=E7=9A=84=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E5=88=92=E5=88=86=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/autotask/MaterialSynchronization.java | 27 +++++++++++++++---- .../acs/service/impl/AcsToWmsServiceImpl.java | 4 ++- .../impl/SSXSendMaterialServiceImpl.java | 2 +- .../sendMaterial/BZXSendMaterialTask.java | 4 ++- .../sendMaterial/BzssxSendMaterialTask.java | 2 +- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/MaterialSynchronization.java b/lms/nladmin-system/src/main/java/org/nl/wms/autotask/MaterialSynchronization.java index 519dbe9..fe5da78 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/autotask/MaterialSynchronization.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/autotask/MaterialSynchronization.java @@ -1,6 +1,23 @@ -package org.nl.wms.autotask;/** -* @Author: lyd -* @Description: -* @Date: 2023/8/2 -*/public class MaterialSynchronization { +package org.nl.wms.autotask; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.basedata.service.impl.MaterialbaseServiceImpl; +import org.springframework.stereotype.Component; + +/** + * @Author: lyd + * @Description: 自定义同步物料 + * @Date: 2023/8/2 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class MaterialSynchronization { + public void run(){ + log.info("定时任务 - 同步物料"); + MaterialbaseServiceImpl bean = SpringContextHolder.getBean(MaterialbaseServiceImpl.class); + bean.synchronize(null); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ca55666..18a2f80 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -337,6 +337,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { CpSendMaterialTask taskBean = SpringContextHolder.getBean(CpSendMaterialTask.class); String task_id = taskBean.createTask(param); } - return null; + JSONObject res = new JSONObject(); + res.put("status", 200); + return res; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/ssxsendmaterial/service/impl/SSXSendMaterialServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/ssxsendmaterial/service/impl/SSXSendMaterialServiceImpl.java index e31a8a6..4a782e4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/ssxsendmaterial/service/impl/SSXSendMaterialServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/ssxsendmaterial/service/impl/SSXSendMaterialServiceImpl.java @@ -52,7 +52,7 @@ public class SSXSendMaterialServiceImpl implements SSXSendMaterialService { throw new BadRequestException("物料不能为空"); } // 执行创建任务并下发给acs: 1001 -> 1004 - param.put("point_code", "BZSSX1001"); + param.put("point_code", "BZX1001"); param.put("material_id", materialId); param.put("vehicle_type", vehicle_type); param.put("qty", qty); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BZXSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BZXSendMaterialTask.java index 9482f8b..73485a9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BZXSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BZXSendMaterialTask.java @@ -116,6 +116,7 @@ public class BZXSendMaterialTask extends AbstractAcsTask { // 1.3选择第一位 startPointCode = startPointCode + "01"; } else { + // 1.6、1.9 startPointCode = startPointCode + "02"; } //判断当前点是否有未完成的任务 @@ -156,7 +157,8 @@ public class BZXSendMaterialTask extends AbstractAcsTask { for (int i = 0; i < taskArr.size(); i++) { JSONObject taskObj = taskArr.getJSONObject(i); JSONObject pointObj = pointTab.query("region_code = 'CPQYA01' AND is_delete = '0' " + - "AND is_used = '1' AND lock_type = '1' AND point_status = '1'").uniqueResult(0); + "AND is_used = '1' AND lock_type = '1' AND point_status = '1' AND can_vehicle_type LIKE '%" + + taskObj.getString("vehicle_type") + "%'").uniqueResult(0); if (ObjectUtil.isEmpty(pointObj)) { taskObj.put("remark", "暂无可用的点位!"); taskObj.put("update_time", DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BzssxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BzssxSendMaterialTask.java index 6a41dad..5a7c9d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BzssxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/BzssxSendMaterialTask.java @@ -158,7 +158,7 @@ public class BzssxSendMaterialTask extends AbstractAcsTask { for (int i = 0; i < taskArr.size(); i++) { JSONObject taskObj = taskArr.getJSONObject(i); // 找BZSSX04, 先查看是否锁住 - JSONObject point = pointTab.query("point_code = 'BZSSX1005' AND lock_type = '1' AND is_used = '1' AND is_delete = '0'").uniqueResult(0); + JSONObject point = pointTab.query("point_code = 'BZX1005' AND lock_type = '1' AND is_used = '1' AND is_delete = '0'").uniqueResult(0); if (ObjectUtil.isEmpty(point)) { taskObj.put("remark", "暂无可用的点位!"); taskObj.put("update_time", DateUtil.now());