From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java | 2 +-
rsf-open-api/src/main/resources/application-dev.yml | 2 +-
rsf-server/src/main/resources/application.yml | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 2 --
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java | 6 ++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 6 +++---
rsf-server/src/main/resources/application-dev.yml | 6 +++---
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/rsf-open-api/src/main/resources/application-dev.yml b/rsf-open-api/src/main/resources/application-dev.yml
index 646090f..e3f40c7 100644
--- a/rsf-open-api/src/main/resources/application-dev.yml
+++ b/rsf-open-api/src/main/resources/application-dev.yml
@@ -63,6 +63,6 @@
port: 8088
wms:
#閾炬帴
- host: http://127.0.0.1
+ host: http://127.0.0.1銆�
#绔彛
port: 8085
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 97f97ff..8b917c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -437,11 +437,11 @@
.setRow(dto.getRow())
.setLev(dto.getLev())
.setId(null)
- .setAreaId(41L)
- .setWarehouseId(27L)
+ .setAreaId(42L)
+ .setWarehouseId(29L)
.setBarcode(string)
.setCol(dto.getBay())
- .setType(dto.getLocType())
+ .setType(dto.getLocType().equals("16") ? "17" : "15")
.setStatus(dto.getStatusBool())
.setUseStatus(LocStsType.getLocSts(dto.getLocSts()));
if (!locService.save(loc)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
index a84cdc8..933bcea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -72,8 +72,6 @@
station.setContainerTypes(longs1);
}
-
-
return R.ok().add(station);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
index 6977f0b..c13f3ed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
@@ -16,7 +16,7 @@
private Integer endNo;
@ApiModelProperty("瀹瑰櫒绫诲瀷")
- private Long containerType;
+ private Long containerType = 3L;
@ApiModelProperty("闀垮害")
private Integer length = 6;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
index ab87338..655148d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -58,7 +58,7 @@
* 鑷姩鐢熸垚搴撲綅鏄庣粏
*/
@Transactional(rollbackFor = Exception.class)
- @Scheduled(cron = "0/25 * * * * ?")
+// @Scheduled(cron = "0/25 * * * * ?")
public void insertRandomMats() {
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type));
for (Loc loc : list) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index bebc4a1..eb5e75e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -270,7 +270,7 @@
* @description: 鍏夌數绔欑偣浠诲姟涓嬪彂
* @version 1.0
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskToWCS() throws Exception {
Long loginUserId = SystemAuthUtils.getLoginUserId();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
index b2c69ed..c0cd7b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
@@ -58,7 +58,9 @@
for (int i = params.getStartNo(); i <= params.getEndNo() ; i++) {
BasContainer container = new BasContainer();
String code = StringUtils.leftPad(i + "", params.getLength(), "0");
-
+ if (!params.getContainerType().equals(3L)) {
+ params.setPrefix("81");
+ }
container.setAreas(areas.getName())
.setCodeType(QRCodeType.QRCODE_TYPE_BARCODE.desc)
.setCode(params.getPrefix() + code)
@@ -74,6 +76,6 @@
throw new CoolException("瀹瑰櫒淇濆瓨澶辫触,璇锋鏌ョ紪鐮佹槸鍚︽湁閲嶅锛侊紒");
}
- return R.ok();
+ return R.ok("鏂板鎴愬姛锛侊紒").add(containerList);
}
}
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 97089e8..ae81f9b 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -14,9 +14,9 @@
# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: rsf
username: root
-# url: jdbc:mysql://10.10.10.200:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# password: xltys1995
- url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -30,7 +30,7 @@
test-on-borrow: true
test-on-return: false
remove-abandoned: true
- remove-abandoned-timeout: 18
+ remove-abandoned-timeout: 1800
#pool-prepared-statements: false
#max-pool-prepared-statement-per-connection-size: 20
filters: stat, wall
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index b5db333..0c99aef 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1