From dcb21dab96bd85999db9995d63e8544920c351fb Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期三, 24 十二月 2025 12:05:25 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 12 ++++++++----
src/main/java/com/zy/asrs/task/InOutSyncScheduler.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index 1cee8e6..71fe9dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -55,14 +55,18 @@
throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
}
//瀵逛簬宸茬粡鏈夊簱瀛樼殑妯″叿 涓嶅厑璁稿啀娆＄粍鎵�
- List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", mat.getMatnr()));
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matBarcode.getMatnr()));
if (!Cools.isEmpty(locDetlList)) {
throw new CoolException("璇ユā鍏峰凡缁忓叆搴�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
}
//瀵逛簬宸茬粡鏈夊伐浣滄。鐨勬ā鍏� 涓嶅厑璁稿啀娆＄粍鎵�
- List<WrkDetl> wrkDetlList = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("matnr", mat.getMatnr()));
- if (!Cools.isEmpty(wrkDetlList)) {
- throw new CoolException("璇ユā鍏峰凡缁忓瓨鍦ㄥ伐浣滄。,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ List<WrkDetl> wrkDetlList = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("matnr", matBarcode.getMatnr()));
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("matnr", matBarcode.getMatnr()));
+ if (wrkDetl != null){
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()));
+ if (!Cools.isEmpty(wrkDetlList) && wrkMast1.getWrkSts() != 15) {
+ throw new CoolException("璇ユā鍏峰凡缁忓瓨鍦ㄥ伐浣滄。,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
diff --git a/src/main/java/com/zy/asrs/task/InOutSyncScheduler.java b/src/main/java/com/zy/asrs/task/InOutSyncScheduler.java
index dd6ad89..d5cece9 100644
--- a/src/main/java/com/zy/asrs/task/InOutSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InOutSyncScheduler.java
@@ -63,7 +63,7 @@
}
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
private void syncBarcodeMat(){
List<MatBarcode> matBarcodeList = matBarcodeService.select100();
if (matBarcodeList.size() == 0){
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f515e5c..b828f1f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -332,7 +332,7 @@
}
}
- if (locMasts.size() < 2){
+ if (locMasts.size() < 5){
throw new CoolException("鏃犵┖搴撲綅鍙敤");
}
List<LocMast> locMastList = new ArrayList<>();
--
Gitblit v1.9.1