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 | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 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 ea069c9..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
@@ -9,6 +9,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper;
import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
@@ -26,15 +27,19 @@
public class ProduceDivisionService extends BizServiceImpl<ProduceDivisionMapper, ProduceDivision> {
@Autowired
private MdmUserService tUserService;
+ @Autowired
+ private QinzheFgbService qinzheFgbService;
+
/**
* 鏂板鍒嗗伐琛�
* @param vo
*/
@Transactional
public void saveDivision(ProduceDivisionVO vo){
- if(drawingNoExists(vo.getDrawingNo(),null)){
+ /*
+ if(drawingNoExists(vo.getpro,null)){
throw new ServiceException("鍥惧彿宸插瓨鍦細"+vo.getDrawingNo());
- }
+ }*/
ProduceDivision plan = new ProduceDivision();
BeanUtil.copyProperties(vo, plan);
this.save(plan);
@@ -46,11 +51,12 @@
* @param excludeId 鎺掗櫎id
* @return 鏄惁瀛樺湪
*/
+ /*
boolean drawingNoExists(String drawingNo,Long excludeId){
return this.lambdaQuery()
.eq(ProduceDivision::getDrawingNo, drawingNo)
.ne(excludeId!=null,ProduceDivision::getId,excludeId).count()>0;
- }
+ }*/
/**
* 淇敼鍒嗗伐琛�
@@ -61,9 +67,10 @@
if(vo.getId() == null){
throw new ServiceException("id涓嶈兘鏈┖");
}
+ /*
if(drawingNoExists(vo.getDrawingNo(),vo.getId())){
throw new ServiceException("鍥惧彿宸插瓨鍦細"+vo.getDrawingNo());
- }
+ }*/
ProduceDivision plan = this.getById(vo.getId());
@@ -154,12 +161,37 @@
.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);
+
+ /**
+ * 鏍规嵁鍕ゅ摬闆朵欢鍙蜂簬涓荤缂栧埗鑾峰彇鍒嗗伐琛ㄦ暟鎹� 鍥惧彿->鍕ゅ摬鏁版嵁锛堢紪鍒讹級 -> 涓诲埗鍒嗗伐琛ㄦ暟鎹�
+ *
+ * @param drawingNo
+ * @return
+ */
+ public ProduceDivision getByDrawingNoWithQinzhe(String drawingNo){
+ QinzheFgb qinzheFgb = qinzheFgbService.getByLjh(drawingNo);
+ if(qinzheFgb == null){
+ throw new ServiceException("鏈壘鍒伴浂缁勪欢鍙�:"+drawingNo);
}
+
+ Long programmerId = tUserService.getUserIdByName(qinzheFgb.getZggy());
+ if(programmerId == null){
+ 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()+"]瀵瑰簲鐨勬暟鎹�");
+ }
+
+ return division;
}
+
+ /**
+ * 閫夋嫨涓荤宸ヨ壓鏁版嵁
+ * @param programmer
+ * @return
+ */
+ public List<ProduceDivisionViewVO> queryProgrammer(String programmer) {
+ return baseMapper.queryProgrammer(programmer);
+ }
}
--
Gitblit v1.9.3