From def0592989d8b9c373f297b0fff049bd6d039b56 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 08:21:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 14 ++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 4407e44..35de60e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -167,6 +167,9 @@
public void startupFullTakeStore(StockOutParam param, Long userId) {
// 鐩爣绔欑偣鐘舵�佹娴�
Date now = param.getNowTime();
+ if (Cools.isEmpty(now)){
+ now = new Date();
+ }
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
@@ -519,12 +522,14 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
+ double pri = YyyyMmddUtils.convertPriD(new Date());
+
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(pri); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -773,6 +778,10 @@
@Override
@Transactional
public void locCheckOut(StockOutParam param, Long userId) {
+ Date now = param.getNowTime();
+ if (Cools.isEmpty(now)){
+ now = new Date();
+ }
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
@@ -788,6 +797,7 @@
if (locMast.getLocSts().equals("F")){
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
+ staNo.setModiTime(now);
stockOut(staNo, locDetlDtos, IoWorkType.CHECK_OUT, userId);
}else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
@@ -824,7 +834,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(99999999D);
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
diff --git a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
index 360a2ac..c4b3b36 100644
--- a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
@@ -20,6 +20,7 @@
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -173,9 +174,11 @@
}
}
if (sign){
+ Date date = new Date();
StockOutParam param122 = new StockOutParam();
param122.setOutSite(122);
param122.setLocDetls(locDetls122);
+ param122.setNowTime(date);
if (total>0 && locDetls122.size()>0){
workService.locCheckOut(param122,9999L);
@@ -184,6 +187,7 @@
StockOutParam param171 = new StockOutParam();
param171.setOutSite(171);
param171.setLocDetls(locDetls171);
+ param171.setNowTime(date);
if (total>0 && locDetls171.size()>0){
workService.locCheckOut(param171,9999L);
}
--
Gitblit v1.9.1