From db11805d2209fd37b24037fce159c7d5a39d8177 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 20 十二月 2025 14:40:41 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 13 +++++++++++++
1 files changed, 13 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 4eac6f3..00c5fb3 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,12 @@
Mat mat = matService.selectByMatnr(matBarcode.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(matBarcode.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+
+ //瀵逛簬宸茬粡缁勬墭杩囩殑 妯″叿+鎵樼洏 涓嶅厑璁稿啀娆＄粍鎵�
+ Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr(), matBarcode.getZpallet());
+ if (waitPakinCount >= 1){
+ throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr() + "鎵樼洏鐮�:" + matBarcode.getZpallet());
}
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
@@ -72,4 +80,9 @@
public Integer selectCountByMatNr(String matnr) {
return this.baseMapper.selectCountByMatNr(matnr);
}
+
+ @Override
+ public Integer selectByBarcodeAndMatnr(String matnr, String zpallet) {
+ return this.baseMapper.selectByBarcodeAndMatnr(matnr, zpallet);
+ }
}
--
Gitblit v1.9.1