mes-basic/src/main/java/com/chinaztt/mes/basic/dto/ParamDTO.java
@@ -37,4 +37,5 @@ */ private List<SysDictItem> sysDictItemList; } 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) { 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()); 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()); 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())){ 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()); 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++) { 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(); 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; } 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; } 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); 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:
