From 6ace06809f14553e2c4c48c15630b8cdb5672e5a Mon Sep 17 00:00:00 2001 From: songxiaopeng <1393756821@qq.com> Date: Fri, 26 Apr 2024 17:56:23 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA;=E4=BF=AE=E6=94=B9=E9=80=81=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 1 + .../src/main/java/org/nl/wms/ext/wql/ext.xls | Bin 53760 -> 54272 bytes .../java/org/nl/wms/sch/tasks/SendTask.java | 12 +++++++----- lms/qd/src/router/routers.js | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 794822c..6291f9c 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -422,6 +422,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public JSONObject receiveOrder(JSONObject json) { + log.info("receiveOrder出库单参数：-------------------------------------"+json); String reqCode = json.getString("reqCode"); String deliveryNo = json.getString("deliveryno"); String deliveryLineNo = json.getString("deliverylineno"); diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls index 4cfd4f814af8717b5a23204189d3b92bd7efa54e..2f53446d1fcba3c8a0eb197c1214a40a4f0616df 100644 GIT binary patch delta 4997 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 BDvJOB diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java index 38cac16..77666a1 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendTask.java @@ -11,8 +11,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.nl.exception.BadRequestException; +import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; +import org.nl.utils.SpringContextHolder; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wql.WQL; @@ -186,13 +188,13 @@ public class SendTask extends AbstractAcsTask { param.put("whseId","WMWHSE12"); param.put("lkCode","lk_code"); param.put("itemRows",array); - String api =""; + String api = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("feedback_url").getValue(); try { String resultMsg = HttpRequest.post(api) .body(String.valueOf(param)) .execute().body(); JSONObject result = JSONObject.parseObject(resultMsg); - log.info("上游系统反馈结果----------------+" + api + ",---" + result.toString()); + log.info("反馈出库结果----------------+" + api + ",---" + result.toString()); } catch (Exception e) { String msg = e.getMessage(); System.out.println(msg); @@ -279,7 +281,7 @@ public class SendTask extends AbstractAcsTask { if (!"00".equals(nextPoint.getString("point_status"))) { throw new BadRequestException("终点有货"); } - String taskTd = createTaskRelated( + String taskId = createTaskRelated( startPoint, nextPoint, param, @@ -289,10 +291,10 @@ public class SendTask extends AbstractAcsTask { "2"); WQLObject noteTaskTab = WQLObject.getWQLObject("ext_delivery_note_task"); Map data = new HashMap<>(); - data.put("task_id",taskTd); + data.put("task_id",taskId); data.put("note_id",noteId); noteTaskTab.insert(data); - return taskTd; + return taskId; } // 查询点位的送料区域 diff --git a/lms/qd/src/router/routers.js b/lms/qd/src/router/routers.js index 013eaa5..c3f22f2 100644 --- a/lms/qd/src/router/routers.js +++ b/lms/qd/src/router/routers.js @@ -45,7 +45,7 @@ export const constantRouterMap = [ children: [ { path: 'dashboard', - component: (resolve) => require(['@/views/home'], resolve), + component: (resolve) => require(['@/views/monitor/server/index'], resolve), name: 'Dashboard', meta: { title: '首页', icon: 'index', affix: true, noCache: true } }