From 625c1058066a01d4d6c2f058d2a4cb1211a80576 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 20 六月 2025 08:52:46 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 4 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 2 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index f924d66..d9e5e87 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -117,8 +117,8 @@
/**
* 鐢熸垚鑷姩鐩樼偣浠诲姟
*/
- @Scheduled(cron = "0/50 * * * * ?")
- @Transactional(rollbackFor = Exception.class)
+// @Scheduled(cron = "0/50 * * * * ?")
+// @Transactional(rollbackFor = Exception.class)
public void genCheckTask() {
Loc locs = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.F.val()).orderByAsc(Loc::getLocNo).last("limit 1"));
if (Objects.isNull(locs)) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index 39f9fe5..cce5d1a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -151,7 +151,7 @@
return R.parse(CodeRes.USER_10003);
}
String system = null;//鐧婚檰绯荤粺
- if (wms) {
+ if (Objects.isNull(wms) || wms) {
system = String.valueOf(LoginSystemType.WMS);
}else {
system = String.valueOf(LoginSystemType.WCS);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java
index b2985e7..3203883 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Loc.java
@@ -103,6 +103,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index 963ea61..bcf2089 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -187,7 +187,7 @@
public Double getWaitQty(){
Double qty = 0D;
WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
- List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));
for (WaitPakin waitPakin : waitPakins) {
qty += waitPakin.getAnfme();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index fe95e86..fa0028a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -468,6 +468,7 @@
}
OrderDetlLog orderDetlLog = new OrderDetlLog();
BeanUtils.copyProperties(byId, orderDetlLog);
+ orderDetlLog.setId(null);
orderDetlLog.setQty(order.getWorkQty());
orderDetlLog.setWorkQty(0.0);
if (!orderDetlLogService.save(orderDetlLog)) {
@@ -511,6 +512,7 @@
orderList.forEach(one -> {
OrderLog orderLog = new OrderLog();
BeanUtils.copyProperties(one, orderLog);
+ orderLog.setId(null);
orderLog.setOrderSettle(OrderSettleType.COMPLETE.val());
if (!orderLogService.save(orderLog)) {
--
Gitblit v1.9.1