From 828641ce9d4178bbff9030ad19ce93d0267f185c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 17 九月 2025 08:36:42 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java | 6 +++---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 1 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java | 1 -
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 96fd17d..a82c4f1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -99,7 +99,6 @@
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
- @Transactional(rollbackFor = Exception.class)
public R lightOff(@RequestBody Map<String, Object> request) {
if (Objects.isNull(request)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index 849c147..41500c5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -205,7 +205,7 @@
waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
waveSeed.setTaskDetlId(taskDetl.getId());
//涓烘弧瓒冲綋鍓嶉渶姹傦紝缁忕‘璁わ紝鏀规垚璁㈠崟鏁伴噺
- waveSeed.setAnfme(taskDetl.getAnfme());
+ waveSeed.setAnfme(orderDetl.getAnfme());
waveSeed.setWorkQty(0D);
waveSeed.setMatnr(taskDetl.getMatnr());
waveSeed.setBatch(taskDetl.getBatch());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
index 5e98f59..9b2fcc2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
@@ -62,9 +62,9 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
-// if (!licenseTimer.getSystemSupport()) {//璁稿彲璇佸凡澶辨晥
-// return R.parse(CodeRes.SYSTEM_20001);
-// }
+ if (!licenseTimer.getSystemSupport()) {//璁稿彲璇佸凡澶辨晥
+ return R.parse(CodeRes.SYSTEM_20001);
+ }
String username = param.getUsername();
Long hostId = param.getHostId();
User user = userService.getByUsername(username, hostId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
index ff7dfb9..4630b9b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java
@@ -101,7 +101,6 @@
int day = (int) (num / 24 / 60 / 60 / 1000);
licenseTimer.setLicenseDays(day);
}
-
return install != null;
} catch (Exception e) {
return false;
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
index 0089f18..876b512 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -30,7 +30,7 @@
mws.matnr,
mws.order_no,
mws.order_id,
- od.anfme AS rev_qty,
+ mws.anfme AS rev_qty,
SUM( mws.anfme ) anfme,
mws.wave_no,
SUM( mws.work_qty ) work_qty,
--
Gitblit v1.9.1