From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
index 4d220a8..fceba39 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java
@@ -2,8 +2,11 @@
import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pmsGlobal.daoPlt.PltProductionLineMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
+import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -20,13 +23,18 @@
public class StationSv {
private PltStationMapper dao;
- private static final String stationPrefix = "103" ;
+ private PltProductionLineMapper lineDao;
+// private static final String stationPrefix = "103" ;
private static final String DEFAULT_CODE = "0001";
private static final String CODE_FORMAT = "%04d";
@Autowired
public void setDao(PltStationMapper dao) {
this.dao = dao;
+ }
+ @Autowired
+ public void setLineDao(PltProductionLineMapper lineDao) {
+ this.lineDao = lineDao;
}
@Transactional
@@ -85,12 +93,12 @@
boolean flag = false;
List<PltStation> stations = dao.selectByName(station.getName());
for (int i = 0; i < stations.size(); i++) {
- if(stations.get(i).getId().equals(station.getId())){
+ if(!stations.get(i).getId().equals(station.getId())){
flag = true;
break;
}
}
- if(!flag){
+ if(flag){
throw new RuntimeException("宸ョ珯鍚嶇О("+station.getName()+")宸插瓨鍦�,鍚嶇О涓嶅厑璁搁噸澶嶆坊鍔�,璇峰彉鏇�");
}
int count = dao.updateByPrimaryKeySelective(station);
@@ -118,13 +126,20 @@
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
rsVo.obj = this.dao.selectSome(params) ;
rsVo.obj.parallelStream().forEach(item->{
- item.qrCode = QrCodeUtil.genQrCodeString(stationPrefix+item.id);
+ item.qrCode = QrCodeUtil.genQrCodeString(QrCodeConstant.TypeStation+item.id);
});
return rsVo ;
}
@Transactional
public int disabled(Long id, Boolean disabled) {
+ if(!disabled){
+ PltStation station1 = dao.selectByPrimaryKey(id);
+ PltProductionLine line = lineDao.selectByPrimaryKey(station1.lineId);
+ if(line.disabled){
+ throw new RuntimeException("璇ュ伐绔欐墍灞炵敓浜х嚎宸茬鐢�,璇峰厛鍚敤璇ョ敓浜х嚎");
+ }
+ }
PltStation station = new PltStation();
station.setId(id);
station.setDisabled(disabled);
--
Gitblit v1.8.0