From 13887c2ec44d483eadedd98c3c1aa06efeb786d4 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期日, 21 十二月 2025 11:37:13 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 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 8c0c0e2..21cf0de 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();
@@ -46,6 +48,12 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(matBarcode.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+
+ //瀵逛簬宸茬粡缁勬墭杩囩殑 妯″叿+鎵樼洏 涓嶅厑璁稿啀娆＄粍鎵�
+ Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr());
+ if (waitPakinCount >= 1){
+ throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
WaitPakin waitPakin1 = new WaitPakin();
waitPakin1.sync(mat);
///waitPakin1.setProType(dto.getProType());
@@ -56,6 +64,7 @@
waitPakin1.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin1.setAnfme(1.0); // 鏁伴噺
waitPakin1.setStatus("Y"); // 鐘舵��
+ waitPakin1.setModel(mat.getName());
//waitPakin1.setAppeUser(waitPakin.getAppeUser());
waitPakin1.setAppeTime(now);
//waitPakin1.setModiUser(waitPakin.getAppeUser());
@@ -66,4 +75,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