From 0b892279761b47b56a1113848cd4f479cf8d00f2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 23 十二月 2025 17:02:55 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 346238c..1cee8e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.common.model.DetlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -28,6 +29,7 @@
@Autowired
private WaitPakinService waitPakinService;
+ @Transactional
@Override
public void comb(List<MatBarcode> list) {
String zpallet = list.get(0).getZpallet();
@@ -45,6 +47,22 @@
Mat mat = matService.selectByMatnr(matBarcode.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(matBarcode.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+
+ //瀵逛簬宸茬粡缁勬墭杩囩殑 妯″叿 涓嶅厑璁稿啀娆＄粍鎵�
+ Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr());
+ if (waitPakinCount >= 1){
+ throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
+ //瀵逛簬宸茬粡鏈夊簱瀛樼殑妯″叿 涓嶅厑璁稿啀娆＄粍鎵�
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", mat.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());
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
@@ -67,4 +85,14 @@
}
}
}
+
+ @Override
+ public Integer selectCountByMatNr(String matnr) {
+ return this.baseMapper.selectCountByMatNr(matnr);
+ }
+
+ @Override
+ public Integer selectByBarcodeAndMatnr(String matnr) {
+ return this.baseMapper.selectByBarcodeAndMatnr(matnr);
+ }
}
--
Gitblit v1.9.1