From db9a7f9c1b61af84be764a399b3f1f85e0ff03ee Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 09:37:36 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 9 +++++----
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 19 ++++++++++++++++---
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index 4b0b6d4..b9dad76 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -8,11 +8,10 @@
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.MatBarcodeMapper;
-import com.zy.asrs.service.HalfBarcodeService;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -27,14 +26,28 @@
private MatService matService;
@Autowired
private HalfBarcodeService halfBarcodeService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
public MatBarcode selectbyMatnr(String matnr) {
return this.baseMapper.selectByMatnr(matnr);
}
+ @Transactional
@Override
public void deleteMatBarcode(List<MatBarcode> list) {
for (MatBarcode matBarcode : list) {
+ //瀵逛簬宸茬粡鏈夊簱瀛� 缁勬墭妗� 宸ヤ綔妗ｇ殑鏁版嵁 涓嶅厑璁歌В缁�
+ Integer locCount = locDetlService.selectCountByMatNr(matBarcode.getMatnr());
+ Integer waitCount = waitPakinService.selectCountByMatNr(matBarcode.getMatnr());
+ Integer wrkCount = wrkDetlService.selectCountByMatNr(matBarcode.getMatnr());
+ if (locCount > 0 || waitCount > 0 || wrkCount > 0){
+ throw new CoolException("缁勬墭妗�/搴撳瓨/宸ヤ綔妗ｅ瓨鍦ㄨ妯″叿,涓嶈兘瑙ｇ粦,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr() + "鎵樼洏鐮�:" + matBarcode.getZpallet());
+ }
//瀵规ā鍏风殑瑙勬牸鍋氬鐞嗗緱鍒板帤搴�
Integer thickness = 0;
if (!Cools.isEmpty(matBarcode.getSpecs())){
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 07113a6..cf5fd80 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -11,13 +11,11 @@
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.mapper.TagMapper;
-import com.zy.asrs.service.InOutService;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.TagService;
+import com.zy.asrs.service.*;
import com.zy.common.entity.MatExcel;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.Date;
@@ -64,6 +62,9 @@
MatService matService = SpringUtils.getBean(MatService.class);
InOutService inOutService = SpringUtils.getBean(InOutService.class);
MatBarcodeService matBarcodeService = SpringUtils.getBean(MatBarcodeService.class);
+ WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ WaitPakinService waitPakinService = SpringUtils.getBean(WaitPakinService.class);
Date now = new Date();
Long tagId;
// 鍒嗙被
--
Gitblit v1.9.1