迦南fix

lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendMaterialTask.java

@@ -235,17 +235,17 @@ public class SendMaterialTask extends AbstractAcsTask {
 
         PointService pointService = SpringContextHolder.getBean(PointService.class);
 
-        // 起点是空位不能搬
+//        // 起点是空位不能搬
         PointDto startPoint = pointService.findByCode(start_point_code);
-        if (StrUtil.equals(startPoint.getPoint_status(), "00")) {
-            throw new BadRequestException("起点是空位");
-        }
-
-        // 终点不是空位不能搬
+//        if (StrUtil.equals(startPoint.getPoint_status(), "00")) {
+//            throw new BadRequestException("起点是空位");
+//        }
+//
+//        // 终点不是空位不能搬
         PointDto nextPoint = pointService.findByCode(next_point_code);
-        if (!StrUtil.equals(nextPoint.getPoint_status(), "00")) {
-            throw new BadRequestException("终点不是空位");
-        }
+//        if (!StrUtil.equals(nextPoint.getPoint_status(), "00")) {
+//            throw new BadRequestException("终点不是空位");
+//        }
 
         // 判断起点有没有未完成的指令
         JSONObject startPointTask = taskTable

lms/hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -68,7 +68,7 @@ spring:
             multi-statement-alagvslow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:1}
+    database: ${REDIS_DB:3}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}

lms/hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -157,4 +157,6 @@ jetcache:
         maxTotal: 1000
       uri:
         - redis://localhost:6379
-
+loki:
+  url: http://localhost:3100/loki/api/v1
+  systemName: lms

lms/hd/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data: