From 6e8779ca0379dc8229768e9212bfaa0d42baa660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Sat, 15 Jun 2024 15:54:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E4=BA=A7?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E5=B7=A5=E5=BA=8FCD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 + .../com/dsic/gj_erp/config/RedisConfig.java | 67 ++++++++++++++++ .../jhgk/三月滚动排产控制器.java | 39 ++++++++- .../controller/sy/SyUserLogController.java | 2 +- .../java/com/dsic/gj_erp/pc/Constant.java | 18 ++--- .../java/com/dsic/gj_erp/pc/DataFactory.java | 79 ++++++++----------- .../dsic/gj_erp/pc/dto/sb/设备01上料.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备02抛丸.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备03理料.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备04划线.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备05切割.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备07坡口.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备08曲面.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备09打磨.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备10型材.java | 5 ++ .../pc/dto/sb/设备21自由边处理.java | 5 ++ .../dsic/gj_erp/pc/dto/sb/设备31光电.java | 5 ++ .../dsic/gj_erp/pc/dto/套料图工序.java | 7 +- .../java/com/dsic/gj_erp/pc/dto/设备.java | 10 +++ .../gj_erp/pc/service/工序CD接口.java | 51 ++++++++++++ .../gj_erp/pc/service/设备产能接口.java | 48 +++++++++++ .../java/com/dsic/gj_erp/pc/工序CD.java | 11 +++ .../java/com/dsic/gj_erp/pc/设备产能.java | 19 +++++ 23 files changed, 351 insertions(+), 59 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/config/RedisConfig.java create mode 100644 src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java create mode 100644 src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java create mode 100644 src/main/java/com/dsic/gj_erp/pc/工序CD.java create mode 100644 src/main/java/com/dsic/gj_erp/pc/设备产能.java diff --git a/pom.xml b/pom.xml index 0bc97ef..4daeded 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,10 @@ org.springframework.boot spring-boot-starter-data-redis + + org.springframework.boot + spring-boot-starter-cache + org.projectlombok lombok diff --git a/src/main/java/com/dsic/gj_erp/config/RedisConfig.java b/src/main/java/com/dsic/gj_erp/config/RedisConfig.java new file mode 100644 index 0000000..a7e4863 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/config/RedisConfig.java @@ -0,0 +1,67 @@ +package com.dsic.gj_erp.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +import java.time.Duration; + +@EnableCaching +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) { + // 设置序列化 + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + jackson2JsonRedisSerializer.setObjectMapper(om); + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(lettuceConnectionFactory); + RedisSerializer stringSerializer = new StringRedisSerializer(); + redisTemplate.setKeySerializer(stringSerializer); + redisTemplate.setValueSerializer(jackson2JsonRedisSerializer); + redisTemplate.setHashKeySerializer(stringSerializer); + redisTemplate.setHashValueSerializer(jackson2JsonRedisSerializer); + redisTemplate.afterPropertiesSet(); + return redisTemplate; + } + @Bean + public RedisCacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory){ + RedisSerializer redisSerializer = new StringRedisSerializer(); + Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); + + //解决查询缓存转换异常的问题 + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);//这一句必须要，作用是序列化时将对象全类名一起保存下来 + om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL); + jackson2JsonRedisSerializer.setObjectMapper(om); + + //配置序列化(解决乱码的问题) + RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig() + .entryTtl(Duration.ofSeconds(-1))//设置 key 过期时间 + .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer)) //设置key序列化规则 + .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer))//设置value序列化规则 + .disableCachingNullValues(); + + RedisCacheManager cacheManager = RedisCacheManager.builder(redisConnectionFactory) + .cacheDefaults(config) + .build(); + return cacheManager; + } +} diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java index 58a4e06..ec3ae4e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java @@ -4,11 +4,13 @@ import cn.hutool.core.util.StrUtil; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.pc.service.三月滚动接口; +import com.dsic.gj_erp.pc.service.工序CD接口; +import com.dsic.gj_erp.pc.service.设备产能接口; +import com.dsic.gj_erp.pc.工序CD; import com.dsic.gj_erp.pc.排产; +import com.dsic.gj_erp.pc.设备产能; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.concurrent.Semaphore; @@ -19,6 +21,8 @@ import java.util.concurrent.Semaphore; public class 三月滚动排产控制器 { private final 三月滚动接口 _三月滚动接口; + private final 设备产能接口 _设备产能接口; + private final 工序CD接口 _工序CD接口; private static Semaphore semaphore = new Semaphore(1); @@ -78,4 +82,33 @@ public class 三月滚动排产控制器 { return new ResultBean<>(map); } + @GetMapping("getCdAll") + public ResultBean 获取全部工序CD(){ + Object o = _工序CD接口.get(); + return new ResultBean<>(o); + } + + @PostMapping("saveGxcd") + public ResultBean 设置工序CD(@RequestBody 工序CD _工序CD){ + _工序CD接口.save(_工序CD); + return new ResultBean<>(); + } + + @GetMapping("getSbcnAll") + public ResultBean 获取全部产能(){ + Object o = _设备产能接口.get(); + return new ResultBean<>(o); + } + + @PostMapping("saveSbcn") + public ResultBean 设置产能(@RequestBody 设备产能 _设备产能){ + _设备产能接口.save(_设备产能); + return new ResultBean<>(); + } + + @GetMapping("remove") + public ResultBean 删除产能(String code){ + _设备产能接口.remove(code); + return new ResultBean<>(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java b/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java index 776677a..763b16d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java +++ b/src/main/java/com/dsic/gj_erp/controller/sy/SyUserLogController.java @@ -31,7 +31,7 @@ public class SyUserLogController { log.setYhms(name); String ipAddr = IPUtils.getIpAddr(request); log.setIp(ipAddr); - log.setMac(IPUtils.getMACAddress(ipAddr)); +// log.setMac(IPUtils.getMACAddress(ipAddr)); log.setCreated(DateUtil.now()); log.insert(); return new ResultBean<>(); diff --git a/src/main/java/com/dsic/gj_erp/pc/Constant.java b/src/main/java/com/dsic/gj_erp/pc/Constant.java index 4c35649..716e14c 100644 --- a/src/main/java/com/dsic/gj_erp/pc/Constant.java +++ b/src/main/java/com/dsic/gj_erp/pc/Constant.java @@ -7,16 +7,16 @@ import lombok.Getter; public interface Constant { //相对于钢料需求期 ImmutableMap<工序, Integer> 工序CD = ImmutableMap.<工序, Integer>builder() - .put(工序.上料, -10) - .put(工序.抛丸, -8) - .put(工序.理料, -8) - .put(工序.划线, -5) - .put(工序.切割, -5) - .put(工序.坡口, -3) - .put(工序.型材面板, -2) + .put(工序.上料, -14) + .put(工序.抛丸, -12) + .put(工序.理料, -11) + .put(工序.划线, -9) + .put(工序.切割, -7) + .put(工序.坡口, -5) + .put(工序.型材面板, -11) .put(工序.曲型, -5) .put(工序.打磨, -5) - .put(工序.预配盘, 0) + .put(工序.预配盘, -3) .put(工序.光电结束, -3) .put(工序.自由边处理,0) .put(工序.号料,0) @@ -48,7 +48,7 @@ public interface Constant { 坡口01(工序.坡口, "坡口01", "", 2.0, 3.0, 100.0, 13.0, 13.0), 型材01(工序.型材面板, "型材01", "", 2.0, 3.0, 100.0, 13.0, 13.0), 曲加工01(工序.曲型, "曲加工01", "", 2.0, 3.0, 100.0, 13.0, 13.0), - 打磨01(工序.打磨, "打磨01", "", 2.0, 3.0, 100.0, 13.0, 13.0), + 打磨01(工序.打磨, "打磨01", "", 2.0, 3.0, 0, 0, 0), 自由边处理01(工序.自由边处理, "自由边处理01", "", 2.0, 3.0, 100.0, 13.0, 13.0), 光电01(工序.光电结束, "光电01", "", 2.0, 3.0, 100.0, 13.0, 13.0), diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java index 0aa41cb..1b47b2a 100644 --- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java +++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java @@ -19,6 +19,8 @@ import com.dsic.gj_erp.pc.dto.sb.*; import com.dsic.gj_erp.pc.dto.tlt.*; import com.dsic.gj_erp.pc.dto.排产结果; import com.dsic.gj_erp.pc.dto.*; +import com.dsic.gj_erp.pc.service.工序CD接口; +import com.dsic.gj_erp.pc.service.设备产能接口; import com.dsic.gj_erp.service.jcsj.EmGcrlService; import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jcsj.EmSbjbbService; @@ -34,7 +36,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static com.dsic.gj_erp.pc.Constant.工序CD; import static com.dsic.gj_erp.pc.Manager.排产; import static com.dsic.gj_erp.pc.Manager.*; @@ -46,10 +47,16 @@ public class DataFactory { Manager.排产结果=new ArrayList<>(); List<钢料需求> list=读取钢料需求(); + 工序CD接口 _工序CD接口 = getBean(工序CD接口.class); + List<工序CD> 工序CDS = _工序CD接口.get(); + Map 工序CDMap=new HashMap<>(); + 工序CDS.forEach(item->工序CDMap.put(item.getGx(),item)); + list.forEach(钢料需求 -> { CountDownLatch latch = new CountDownLatch(钢料需求.getBomList().size()); 钢料需求.getBomList().forEach(bom -> { 套料图工序 _套料图工序 = 套料图工序工厂(bom); + _套料图工序.set工序CD(工序CDMap); AtomicBoolean atomicBoolean = new AtomicBoolean(false); if (_套料图工序!=null){ _套料图工序.set需求日期(钢料需求.getXzglxq()); @@ -117,7 +124,7 @@ public class DataFactory { .filter(it -> gx.getCode().contains(it.split("_")[1])).findFirst(); first.ifPresent(_code -> { if (ObjUtil.isNotEmpty(套料图工序对应关系.get(_code))) { - Integer cd = 工序CD.get(gx); + Integer cd = Constant.工序CD.get(gx); DateTime parse = DateUtil.parse(钢料需求.getXzglxq(), "yyyy/MM/dd"); DateTime dateTime = DateUtil.offsetDay(parse, cd); 资源 _资源 = 提取资源(dateTime); @@ -297,70 +304,54 @@ public class DataFactory { } public static 工序产能 工序产能工厂(Constant.工序 _工序) { - Map _设备 = null; + 设备产能接口 _设备产能接口 = getBean(设备产能接口.class); + List<设备产能> 设备产能 = _设备产能接口.get(); + Map _设备; + ImmutableMap.Builder builder = ImmutableMap.builder(); switch (_工序) { case 上料: - _设备 = ImmutableMap.builder() - .put(Constant.设备产能.上料01.设备编号, new 设备01上料(Constant.设备产能.上料01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备01上料(item))); + _设备 = builder.build(); return new 工序01上料(_设备); case 抛丸: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.抛丸01.设备编号,new 设备02抛丸(Constant.设备产能.抛丸01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备02抛丸(item))); + _设备 = builder.build(); return new 工序02抛丸(_设备); case 理料: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.理料01.设备编号,new 设备03理料(Constant.设备产能.理料01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备03理料(item))); + _设备 = builder.build(); return new 工序03理料(_设备); case 划线: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.划线01.设备编号,new 设备04划线(Constant.设备产能.划线01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备04划线(item))); + _设备 = builder.build(); return new 工序04划线(_设备); case 切割: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.龙门01.设备编号,new 设备05切割(Constant.设备产能.龙门01)) - .put(Constant.设备产能.火焰01.设备编号,new 设备05切割(Constant.设备产能.火焰01)) - .put(Constant.设备产能.数控01.设备编号,new 设备05切割(Constant.设备产能.数控01)) - .put(Constant.设备产能.火焰03.设备编号,new 设备05切割(Constant.设备产能.火焰03)) - .put(Constant.设备产能.数控03.设备编号,new 设备05切割(Constant.设备产能.数控03)) - .put(Constant.设备产能.龙门03.设备编号,new 设备05切割(Constant.设备产能.龙门03)) - .put(Constant.设备产能.火焰02.设备编号,new 设备05切割(Constant.设备产能.火焰02)) - .put(Constant.设备产能.数控02.设备编号,new 设备05切割(Constant.设备产能.数控02)) - .put(Constant.设备产能.龙门02.设备编号,new 设备05切割(Constant.设备产能.龙门02)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备05切割(item))); + _设备 = builder.build(); return new 工序05切割(_设备); case 坡口: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.坡口01.设备编号,new 设备07坡口(Constant.设备产能.坡口01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备07坡口(item))); + _设备 = builder.build(); return new 工序07坡口(_设备); case 型材面板: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.型材01.设备编号,new 设备10型材(Constant.设备产能.型材01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备10型材(item))); + _设备 = builder.build(); return new 工序10型材(_设备); case 曲型: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.曲加工01.设备编号,new 设备08曲面(Constant.设备产能.曲加工01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备08曲面(item))); + _设备 = builder.build(); return new 工序08曲面(_设备); case 打磨: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.打磨01.设备编号, new 设备09打磨(Constant.设备产能.打磨01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备09打磨(item))); + _设备 = builder.build(); return new 工序09打磨(_设备); case 自由边处理: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.自由边处理01.设备编号, new 设备21自由边处理(Constant.设备产能.自由边处理01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备21自由边处理(item))); + _设备 = builder.build(); return new 工序21自由边处理(_设备); case 光电结束: - _设备=ImmutableMap.builder() - .put(Constant.设备产能.光电01.设备编号, new 设备31光电(Constant.设备产能.光电01)) - .build(); + 设备产能.stream().filter(item->item.get_工序()==_工序).forEach(item->builder.put(item.getCode(),new 设备31光电(item))); + _设备 = builder.build(); return new 工序31光电(_设备); // case 预配盘: // return new 工序01上料(_工序,_设备); diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备01上料.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备01上料.java index 21e5264..f3ec646 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备01上料.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备01上料.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备01上料 extends 设备 { + public 设备01上料(设备产能 _设备产能) { + super(_设备产能); + } + public 设备01上料(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备02抛丸.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备02抛丸.java index 06963f5..5023dc8 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备02抛丸.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备02抛丸.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备02抛丸 extends 设备 { + public 设备02抛丸(设备产能 _设备产能){ + super(_设备产能); + } + public 设备02抛丸(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备03理料.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备03理料.java index caf00bc..142fe8c 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备03理料.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备03理料.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备03理料 extends 设备 { + public 设备03理料(设备产能 _设备产能){ + super(_设备产能); + } + public 设备03理料(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备04划线.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备04划线.java index 63d8829..3dcb646 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备04划线.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备04划线.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备04划线 extends 设备 { + public 设备04划线(设备产能 _设备产能){ + super(_设备产能); + } + public 设备04划线(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备05切割.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备05切割.java index e4b9c21..4da30d0 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备05切割.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备05切割.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; import lombok.Getter; import lombok.Setter; @@ -13,6 +14,10 @@ public class 设备05切割 extends 设备 { protected double 白班时长=7.0; protected double 二班时长; + public 设备05切割(设备产能 _设备产能){ + super(_设备产能); + } + public 设备05切割(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备07坡口.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备07坡口.java index 402f762..7d681e7 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备07坡口.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备07坡口.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备07坡口 extends 设备 { + public 设备07坡口(设备产能 _设备产能){ + super(_设备产能); + } + public 设备07坡口(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备08曲面.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备08曲面.java index 366bf6d..90a3a29 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备08曲面.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备08曲面.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备08曲面 extends 设备 { + public 设备08曲面(设备产能 _设备产能){ + super(_设备产能); + } + public 设备08曲面(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备09打磨.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备09打磨.java index 2046e14..5ade895 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备09打磨.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备09打磨.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备09打磨 extends 设备 { + public 设备09打磨(设备产能 _设备产能){ + super(_设备产能); + } + public 设备09打磨(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备10型材.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备10型材.java index 8635b7b..e1b58d7 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备10型材.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备10型材.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备10型材 extends 设备 { + public 设备10型材(设备产能 _设备产能){ + super(_设备产能); + } + public 设备10型材(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备21自由边处理.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备21自由边处理.java index 8e66bf4..0c89026 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备21自由边处理.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备21自由边处理.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备21自由边处理 extends 设备 { + public 设备21自由边处理(设备产能 _设备产能){ + super(_设备产能); + } + public 设备21自由边处理(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java index 7ab7308..665183d 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/sb/设备31光电.java @@ -2,9 +2,14 @@ package com.dsic.gj_erp.pc.dto.sb; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.设备产能; public class 设备31光电 extends 设备 { + public 设备31光电(设备产能 _设备产能){ + super(_设备产能); + } + public 设备31光电(Constant.设备产能 _设备产能) { super(_设备产能); } diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/套料图工序.java b/src/main/java/com/dsic/gj_erp/pc/dto/套料图工序.java index 39e61a6..27d447a 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/套料图工序.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/套料图工序.java @@ -9,15 +9,17 @@ import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.pc.dto.data.Bom; import com.dsic.gj_erp.pc.dto.data.钢料需求; import com.dsic.gj_erp.pc.service.套料图工序接口; +import com.dsic.gj_erp.pc.工序CD; import lombok.Getter; import lombok.Setter; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import static com.dsic.gj_erp.pc.Constant.工序CD; +//import static com.dsic.gj_erp.pc.Constant.工序CD; import static com.dsic.gj_erp.pc.DataFactory.提取资源; import static com.dsic.gj_erp.pc.DataFactory.搜索可用资源; import static com.dsic.gj_erp.pc.Manager.from; @@ -32,6 +34,7 @@ public abstract class 套料图工序 implements 套料图工序接口 { protected String 需求日期; protected Date _需求日期; protected List 工序; + protected Map 工序CD; public void run(AtomicBoolean atomicBoolean) { if (ObjUtil.isEmpty(this.bom)||StrUtil.isEmpty(this.bom.getTzbh())){ @@ -60,7 +63,7 @@ public abstract class 套料图工序 implements 套料图工序接口 { } protected boolean 占用资源(Constant.工序 _工序,double 需求数量){ - Integer cd = 工序CD.get(_工序); + Integer cd = 工序CD.get(_工序).getCd(); DateTime dateTime = DateUtil.offsetDay(this._需求日期, cd); 资源 _资源 = 提取资源(dateTime); AtomicBoolean 占用成功=new AtomicBoolean(false); diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/设备.java b/src/main/java/com/dsic/gj_erp/pc/dto/设备.java index 737163d..ee14047 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/设备.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/设备.java @@ -3,6 +3,7 @@ package com.dsic.gj_erp.pc.dto; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.data.Bom; import com.dsic.gj_erp.pc.service.设备接口; +import com.dsic.gj_erp.pc.设备产能; import lombok.Getter; import lombok.Setter; @@ -46,6 +47,15 @@ public abstract class 设备 implements 设备接口 { this.资源占用图表.add(bom); } + public 设备(设备产能 _设备产能){ + this.设备编号= _设备产能.getCode(); + this.设备名称= _设备产能.get设备名称(); + this.白班设备产能= _设备产能.get白班设备产能(); + this.二班设备产能= _设备产能.get二班设备产能(); + this.资源占用图纸表=new ConcurrentLinkedDeque<>(); + this.资源占用图表=new ConcurrentLinkedDeque<>(); + } + public 设备(Constant.设备产能 _设备产能){ this.设备编号= _设备产能.设备编号; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java new file mode 100644 index 0000000..6d56d34 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java @@ -0,0 +1,51 @@ +package com.dsic.gj_erp.pc.service; + +import com.dsic.gj_erp.pc.工序CD; +import com.dsic.gj_erp.pc.设备产能; +import lombok.AllArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +@Service +@AllArgsConstructor +public class 工序CD接口 { + + private static final String KEY="gxcd"; + private final RedisTemplate redisTemplate; + + @CachePut(cacheNames = {KEY},key = "#cd.getGx()") + public Object save(工序CD cd){ + return cd; + } + + @Cacheable(value = {KEY},key = "#gx") + public Object get(String gx){ + return new HashMap<>(); + } + + @CacheEvict(value = {KEY}, key="#gx") + public Object remove(String gx){ + return new HashMap<>(); + } + + public List<工序CD> get(){ + Set keys = redisTemplate.keys(KEY+"::*"); + List<工序CD> list=new ArrayList<>(); + if (keys==null){ + return new ArrayList<>(); + } + for (String key:keys){ + 工序CD _工序CD= (工序CD) redisTemplate.opsForValue().get(key); + list.add(_工序CD); + } + return list; + } +} diff --git a/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java new file mode 100644 index 0000000..82590e6 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java @@ -0,0 +1,48 @@ +package com.dsic.gj_erp.pc.service; + +import com.dsic.gj_erp.pc.设备产能; +import lombok.AllArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +@AllArgsConstructor +public class 设备产能接口 { + + private static final String KEY="sbcn"; + + private final RedisTemplate redisTemplate; + + @CachePut(cacheNames = {KEY},key = "#sbcn.getCode()") + public Object save(设备产能 sbcn){ + return sbcn; + } + + @Cacheable(value = {KEY},key = "#code") + public Object get(String code){ + return new HashMap<>(); + } + + @CacheEvict(value = {KEY}, key="#code") + public Object remove(String code){ + return new HashMap<>(); + } + + public List<设备产能> get(){ + Set keys = redisTemplate.keys(KEY+"::*"); + List<设备产能> list=new ArrayList<>(); + if (keys==null){ + return new ArrayList<>(); + } + for (String key:keys){ + 设备产能 _设备产能= (设备产能) redisTemplate.opsForValue().get(key); + list.add(_设备产能); + } + return list; + } +} diff --git a/src/main/java/com/dsic/gj_erp/pc/工序CD.java b/src/main/java/com/dsic/gj_erp/pc/工序CD.java new file mode 100644 index 0000000..e92766f --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/工序CD.java @@ -0,0 +1,11 @@ +package com.dsic.gj_erp.pc; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class 工序CD { + private Constant.工序 gx; + private Integer cd; +} diff --git a/src/main/java/com/dsic/gj_erp/pc/设备产能.java b/src/main/java/com/dsic/gj_erp/pc/设备产能.java new file mode 100644 index 0000000..f0c232e --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/pc/设备产能.java @@ -0,0 +1,19 @@ +package com.dsic.gj_erp.pc; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class 设备产能 { + private Constant.工序 _工序; + private String code; + private String 设备名称; + private double 单台效率; + private double 单台产能; + private double 白班设备产能; + private double 二班设备产能; + private double 双班合计产能; + private boolean 禁用; + +}