1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java

@@ -29,6 +29,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -82,6 +83,10 @@ public class AppTaskController extends BaseController
     private IAppPmsOrderOutService appPmsOrderOutService;
     @Autowired
     private IAppWaveService appWaveService;
+
+    @Value("${exit.code}")
+    private String exitCode;
+
     /**
      * 查询【请填写功能名称】列表
      */
@@ -934,7 +939,7 @@ public class AppTaskController extends BaseController
                 appTask.setStockNum(tMiStock1.getRemainNum());
                 appTask.setCkType(tMiStock1.getCkType());
                 appTask.setTaskPriority(1);
-                appTask.setDestination("127");
+                appTask.setDestination(exitCode);
                 //wms生成的统一编号
                 appTask.setOrderId(orderId);
                 //库存编号

ruoyi-admin/src/main/resources/application-box.yml

@@ -0,0 +1,64 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        #                url: jdbc:mysql://112.4.208.194:3001/wms_xugongteji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #                username: developer
+        #                password: developer
+        url: jdbc:mysql://10.24.0.62:3306/wms_box?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: wcs
+        password: Wcs123
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

ruoyi-admin/src/main/resources/application.yml

@@ -68,7 +68,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 10.24.0.62
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -119,6 +119,10 @@ swagger:
   # 请求前缀
   pathMapping: /dev-api
 
+exit:
+  # 退出口
+  code: 127
+
 # 防止XSS攻击
 xss:
   # 过滤开关

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -287,6 +287,8 @@ public class TaskExecutor {
                     appStock.setVehicleId(task.getVehicleId());
                     appStock.setLocationId(task.getDestination());
                     appStock.setGoodsId("0");
+                    appStock.setGoodsName("空载具");
+                    appStock.setGoodsUnit("个");
                     appStock.setRemainNum(BigDecimal.ONE);
                     appStock.setOriginNum(BigDecimal.ONE);
                     appStock.setPackingNum(BigDecimal.ZERO);