From 958e45e28ca4f591ab13f2c6f4fe27d57c4880d5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 04 十一月 2023 15:19:31 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/enums/FileEnums.java | 6 +
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/BomServiceImpl.java | 12 ++++
mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java | 1
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java | 17 +++--
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java | 11 +++
mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java | 20 ++++++
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java | 3
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java | 8 ++
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java | 15 ++++
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java | 11 +++
mes-technology/src/main/java/com/chinaztt/mes/technology/dto/StructureTree.java | 20 ++++++
mes-web/src/main/resources/bootstrap.yml | 2
12 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
index 372c340..e85f5b6 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
@@ -37,4 +37,5 @@
*/
private List<SysDictItem> sysDictItemList;
+
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/enums/FileEnums.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/enums/FileEnums.java
index f282336..a645e67 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/enums/FileEnums.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/enums/FileEnums.java
@@ -9,7 +9,11 @@
location("location","搴撲綅"),
division("division","閮ㄩ棬"),
staff("staff","鍛樺伐"),
- post("post","宀椾綅")
+ post("post","宀椾綅"),
+ crew("crew","鐝粍"),
+
+ workstation("workstation","宸ヤ綔绔�"),
+ structure("structure","浜у搧缁撴瀯")
;
FileEnums(String name, String fileName) {
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
index b797923..2d82670 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/CrewServiceImpl.java
@@ -8,22 +8,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chinaztt.mes.basic.dto.CrewDTO;
-import com.chinaztt.mes.basic.entity.*;
+import com.chinaztt.mes.basic.entity.Crew;
+import com.chinaztt.mes.basic.entity.JoinCrewStaff;
+import com.chinaztt.mes.basic.entity.Staff;
import com.chinaztt.mes.basic.excel.CrewData;
-import com.chinaztt.mes.basic.excel.PostData;
import com.chinaztt.mes.basic.mapper.CrewMapper;
import com.chinaztt.mes.basic.mapper.JoinCrewStaffMapper;
import com.chinaztt.mes.basic.mapper.StaffMapper;
import com.chinaztt.mes.basic.service.CrewService;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Objects;
/**
* 浜哄憳鐝粍缁存姢琛�
@@ -94,6 +92,13 @@
List<Staff> staff = staffMapper.selectList(null);
Crew crew = new Crew();
for (CrewData data : list) {
+ QueryWrapper<Crew>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Crew::getCrewName,data.getCrewName());
+ Crew crew1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(crew1)){
+ log.error("鐝粍鍚嶉噸澶�====銆�"+crew1.getCrewName());
+ continue;
+ }
//鏂板鐝粍琛�
if (ObjectUtils.isNotEmpty(data.getCrewName())) {
crew.setCrewName(data.getCrewName());
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
index c9aba27..ba3b912 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/DivisionServiceImpl.java
@@ -27,11 +27,11 @@
import com.chinaztt.mes.basic.mapper.CompanyMapper;
import com.chinaztt.mes.basic.mapper.DivisionMapper;
import com.chinaztt.mes.basic.service.DivisionService;
-import com.chinaztt.ztt.common.core.util.R;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* 閮ㄩ棬
@@ -65,7 +65,14 @@
}
List<Company> companyList = companyMapper.selectList(null);
for (DivisionData data :list){
- Division division = new Division();
+ QueryWrapper<Division>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Division::getDivisionNo,data.getDivisionNo());
+ Division division1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(division1)){
+ log.error("閮ㄩ棬缂栧彿閲嶅========銆�"+data.getDivisionNo());
+ continue;
+ }
+ Division division = new Division();
for (int i = 0; i <companyList.size() ; i++) {
if (companyList.get(i).getCompanyName().equals(data.getCompanyName())){
division.setCompanyId(companyList.get(i).getId());
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
index 11581a2..7785080 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java
@@ -49,6 +49,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* 搴撲綅鍩虹鏁版嵁
@@ -95,6 +96,13 @@
List<Warehouse> warehouses = warehouseMapper.selectList(null);
List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
for (LocationData data : list) {
+ QueryWrapper<Location>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Location::getLocNo,data.getLocNo());
+ Location location = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(location)){
+ log.error("搴撲綅缂栧彿閲嶅=====銆�"+data.getLocNo());
+ continue;
+ }
Location newLocation = new Location();
dict.forEach(a->{
if (a.getLabel().equals(data.getLocType())){
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
index 74adc64..e48e36f 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PostServiceImpl.java
@@ -1,13 +1,16 @@
package com.chinaztt.mes.basic.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-import com.chinaztt.mes.basic.entity.*;
+import com.chinaztt.mes.basic.entity.Company;
+import com.chinaztt.mes.basic.entity.Division;
+import com.chinaztt.mes.basic.entity.Factory;
+import com.chinaztt.mes.basic.entity.Post;
import com.chinaztt.mes.basic.excel.PostData;
-import com.chinaztt.mes.basic.excel.StaffData;
import com.chinaztt.mes.basic.mapper.CompanyMapper;
import com.chinaztt.mes.basic.mapper.DivisionMapper;
import com.chinaztt.mes.basic.mapper.FactoryMapper;
@@ -20,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Objects;
/**
* 宀椾綅琛�
@@ -72,6 +76,13 @@
List<Factory> factories = factoryMapper.selectList(null);
List<Division> divisions = divisionMapper.selectList(null);
for (PostData data : list) {
+ QueryWrapper<Post>QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Post::getPostNo,data.getPostNo());
+ Post post1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(post1)){
+ log.error("宀椾綅缂栧彿閲嶅=====銆�"+data.getPostNo());
+ continue;
+ }
Post post = new Post();
BeanUtils.copyProperties(data, post);
post.setPostName(data.getWorkShops()+"-"+data.getPostName());
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
index a2ecea3..7779669 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
@@ -25,12 +25,13 @@
import com.chinaztt.mes.basic.excel.StaffData;
import com.chinaztt.mes.basic.mapper.*;
import com.chinaztt.mes.basic.service.StaffService;
-import com.chinaztt.ztt.common.data.datascope.DataScope;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐
@@ -40,6 +41,7 @@
*/
@Service
@AllArgsConstructor
+@Slf4j
public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements StaffService {
private DivisionMapper divisionMapper;
@@ -87,6 +89,13 @@
List<Company> companies = companyMapper.selectList(null);
List<Factory> factories = factoryMapper.selectList(null);
for (StaffData staffData : list) {
+ QueryWrapper<Staff> QueryWrapper = new QueryWrapper<>();
+ QueryWrapper.lambda().eq(Staff::getStaffNo,staffData.getStaffNo());
+ Staff staff1 = baseMapper.selectOne(QueryWrapper);
+ if(!Objects.isNull(staff1)){
+ log.error("鍛樺伐缂栧彿閲嶅======銆�"+staffData.getStaffNo());
+ continue;
+ }
Staff staff = new Staff();
BeanUtils.copyProperties(staffData, staff);
for (int i = 0; i < divisions.size(); i++) {
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
index 8251455..e853f3a 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
@@ -137,9 +137,10 @@
List<SysDictItem> dict = dictUtils.getDict("storehouse_type");
for (WarehouseData data :list){
QueryWrapper<Warehouse> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(Warehouse::getWarehouseName,data.getWarehouseName());
+ wrapper.lambda().eq(Warehouse::getWarehouseNo,data.getWarehouseNo());
Warehouse warehouse1 = baseMapper.selectOne(wrapper);
if(!Objects.isNull(warehouse1)){
+ log.error("浠撳簱缂栧彿閲嶅");
continue;
}
Warehouse warehouse = new Warehouse();
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/StructureTree.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/StructureTree.java
index a61acac..61342e5 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/StructureTree.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/dto/StructureTree.java
@@ -54,4 +54,24 @@
private String planningMethod;
private String color;
+
+ private String sharpenerNo;
+
+ private String caveNum;
+
+ private String gramWeight;
+
+ private String gateGramWeight;
+
+ private String moldingCycle;
+
+ private String machine;
+
+ private String scale;
+
+ private String dryingTime;
+
+ private String dryingTemperature;
+
+ private String packingInfo;
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
index 25c1cd2..6794e38 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/entity/StructureComponent.java
@@ -87,4 +87,24 @@
*/
@ApiModelProperty(value = "璁″垝鏂规硶")
private String planningMethod;
+
+ private String sharpenerNo;
+
+ private String caveNum;
+
+ private String gramWeight;
+
+ private String gateGramWeight;
+
+ private String moldingCycle;
+
+ private String machine;
+
+ private String scale;
+
+ private String dryingTime;
+
+ private String dryingTemperature;
+
+ private String packingInfo;
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/BomServiceImpl.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/BomServiceImpl.java
index 722a82e..8ed9c14 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/BomServiceImpl.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/BomServiceImpl.java
@@ -496,6 +496,18 @@
child.setStructureId(structure.getId());
child.setPartId(component.getPartId());
child.setColor(component.getColor());
+
+ child.setSharpenerNo(component.getSharpenerNo());
+ child.setCaveNum(component.getCaveNum());
+ child.setGramWeight(component.getGramWeight());
+ child.setGateGramWeight(component.getGateGramWeight());
+ child.setMoldingCycle(component.getMoldingCycle());
+ child.setMachine(component.getMachine());
+ child.setScale(component.getScale());
+ child.setDryingTime(component.getDryingTime());
+ child.setDryingTemperature(component.getDryingTemperature());
+ child.setPackingInfo(component.getPackingInfo());
+
child.setPartNo(part.getPartNo());
child.setPartName(part.getPartName());
child.setExpand(true);
diff --git a/mes-web/src/main/resources/bootstrap.yml b/mes-web/src/main/resources/bootstrap.yml
index 8947b51..1d6e43d 100644
--- a/mes-web/src/main/resources/bootstrap.yml
+++ b/mes-web/src/main/resources/bootstrap.yml
@@ -8,7 +8,7 @@
# password: postgres123
password: root2022
# 灏勯寮�鍙戞暟鎹簱
- url: jdbc:postgresql://106.13.194.57:9015/postgres
+ url: jdbc:postgresql://127.0.0.1:5432/postgres
application:
name: ztt-mes
cloud:
--
Gitblit v1.9.3