From 307a04b33d1054c89e1acae24ed2913e394635b8 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 01 十二月 2025 09:07:31 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 24 +++++++++++++++++-------
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2 ++
4 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 7fe9917..e6e8a6a 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -36,4 +36,6 @@
@Select("select count(*) from asr_wrk_detl where matnr = #{matnr};")
Integer selectCountByMatNr(String matnr);
+ @Select("select wrk_no from asr_wrk_detl where matnr = #{matnr}")
+ Integer selectWrkNoByMatnr(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index d7b5bc6..2c593de 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -31,4 +31,6 @@
List<PickInParam> selectDetByBarcode(String barcode);
Integer selectCountByMatNr(String matnr);
+
+ Integer selectWrkNoByMatnr(String matnr);
}
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 b9dad76..fa83c2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.HalfBarcode;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.MatBarcodeMapper;
import com.zy.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +29,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
@Override
public MatBarcode selectbyMatnr(String matnr) {
return this.baseMapper.selectByMatnr(matnr);
@@ -44,9 +43,20 @@
//瀵逛簬宸茬粡鏈夊簱瀛� 缁勬墭妗� 宸ヤ綔妗ｇ殑鏁版嵁 涓嶅厑璁歌В缁�
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 wrkCount = wrkDetlService.selectCountByMatNr(matBarcode.getMatnr());
+ if (locCount > 0 || waitCount > 0){
+ throw new CoolException("搴撳瓨/缁勬墭妗ｅ瓨鍦ㄨ妯″叿,涓嶈兘瑙ｇ粦,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr() + "鎵樼洏鐮�:" + matBarcode.getZpallet());
+ }
+ Integer wrkNo = wrkDetlService.selectWrkNoByMatnr(matBarcode.getMatnr());
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast == null){
+ throw new CoolException("宸ヤ綔妗ｅ紓甯革紝鏈夊伐浣滄槑缁嗘。鏃犲伐浣滄。");
+ }
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 101){
+ throw new CoolException("宸ヤ綔妗ｄ笉鏄叏鏉垮嚭搴�/鎷ｆ枡鍑哄簱");
+ }
+ if (wrkMast.getWrkSts() != 14 && wrkMast.getWrkSts() != 15){
+ throw new CoolException("宸ヤ綔妗ｆ湭瀹屾垚");
}
//瀵规ā鍏风殑瑙勬牸鍋氬鐞嗗緱鍒板帤搴�
Integer thickness = 0;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 25a2289..c9182a4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -106,4 +106,9 @@
public Integer selectCountByMatNr(String matnr) {
return this.baseMapper.selectCountByMatNr(matnr);
}
+
+ @Override
+ public Integer selectWrkNoByMatnr(String matnr) {
+ return this.baseMapper.selectWrkNoByMatnr(matnr);
+ }
}
--
Gitblit v1.9.1