From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
index 904a68b..8e402d3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
@@ -161,14 +161,6 @@
.eq(ProduceDivision::getTeamLeaderId,division.getTeamLeaderId()).count()>0;
}
- public ProduceDivision getByDrawingNo(String drawingNo){
- List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
- if(divs.isEmpty()){
- return null;
- }else{
- return divs.get(0);
- }
- }
/**
* 鏍规嵁鍕ゅ摬闆朵欢鍙蜂簬涓荤缂栧埗鑾峰彇鍒嗗伐琛ㄦ暟鎹� 鍥惧彿->鍕ゅ摬鏁版嵁锛堢紪鍒讹級 -> 涓诲埗鍒嗗伐琛ㄦ暟鎹�
@@ -179,22 +171,27 @@
public ProduceDivision getByDrawingNoWithQinzhe(String drawingNo){
QinzheFgb qinzheFgb = qinzheFgbService.getByLjh(drawingNo);
if(qinzheFgb == null){
- throw new ServiceException("鏈壘鍒伴浂缁勪欢鍙�");
+ throw new ServiceException("鏈壘鍒伴浂缁勪欢鍙�:"+drawingNo);
}
Long programmerId = tUserService.getUserIdByName(qinzheFgb.getZggy());
if(programmerId == null){
- throw new ServiceException("鏍规嵁"+qinzheFgb.getZggy()+"鏈壘鍒板搴旂殑绯荤粺鐢ㄦ埛锛岃妫�鏌ョ敤鎴锋槸鍚﹀瓨鍦�");
+ throw new ServiceException("鏍规嵁["+qinzheFgb.getZggy()+"]鏈壘鍒板搴旂殑绯荤粺鐢ㄦ埛锛岃妫�鏌ョ敤鎴锋槸鍚﹀瓨鍦�");
}
ProduceDivision division = lambdaQuery().eq(ProduceDivision::getProgrammerId, programmerId).list().stream().findFirst().orElse(null);
if(division == null){
- throw new ServiceException("涓诲埗鍒嗗伐琛ㄦ棤宸ヨ壓鍛�"+qinzheFgb.getZggy()+"瀵瑰簲鐨勬暟鎹�");
+ throw new ServiceException("浜哄憳鑱岃矗琛ㄦ棤涓荤宸ヨ壓["+qinzheFgb.getZggy()+"]瀵瑰簲鐨勬暟鎹�");
}
- List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
- if(divs.isEmpty()){
- return null;
- }else{
- return divs.get(0);
- }
+
+ return division;
}
+
+ /**
+ * 閫夋嫨涓荤宸ヨ壓鏁版嵁
+ * @param programmer
+ * @return
+ */
+ public List<ProduceDivisionViewVO> queryProgrammer(String programmer) {
+ return baseMapper.queryProgrammer(programmer);
+ }
}
--
Gitblit v1.9.3