update:修改首页显示;修改送料任务

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");

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<String,String> 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;
         }
 
         // 查询点位的送料区域

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 }
       }