From da13bea76b64183790ab17775f04d43d8c7f6607 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 26 十二月 2025 14:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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..71fe9dd 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,26 @@
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", matBarcode.getMatnr()));
+ if (!Cools.isEmpty(locDetlList)) {
+ 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);
///waitPakin1.setProType(dto.getProType());
@@ -56,6 +78,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 +89,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