xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
xhj 2 months ago
parent 86e65dee36 c0994e8f46
commit 21edae7116
9 changed files with 137 additions and 75 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java
Unescape View File

@ -1,5 +1,7 @@
package com.dsic.gj_erp.bean.jcsj;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Getter;
@ -15,15 +17,11 @@ import java.io.Serializable;
@TableName("dm_dwxxp")
public class DmDwxxp implements Serializable {
@MppMultiId
@TableId(type=IdType.AUTO)
private Integer id;
private String dwh;//垛位号
@MppMultiId
private String qy;//区域
private String dcCh;
private String dcPl;
private String dcFd;
}

8
src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java
Unescape View File

@ -31,4 +31,12 @@ public class DmYppyz {
private String ppch;//配盘船号
private String ypph;//预配盘号
private Integer dwxxId;
private StatusEnum status=StatusEnum.未设置垛位;
private enum StatusEnum{
未设置垛位,设置垛位,已配送
}
}

7
src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java
Unescape View File

@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@RestController
@RequestMapping("dwxx")
@ -24,13 +25,15 @@ public class DmDwxxpController {
@PostMapping("addOrEdit")
public ResultBean<?> add(@RequestBody Map<String,List<DmDwxxp>> map){
try {
dwxxpService.saveOrEdit(map.get("add"));
Optional.ofNullable(map.get("add")).ifPresent(item->{
item.forEach(dwxxpService::save);
});
dwxxpService.saveOrEdit(map.get("edit"));
}catch (Exception e){
throw new RuntimeException("同一个区域存在相同垛位号,禁止保存");
}
if (map.get("remove")!=null&& !map.get("remove").isEmpty()){
map.get("remove").forEach(dwxxpService::deleteByMultiId);
map.get("remove").forEach(dwxxpService::removeById);
}
return new ResultBean<>();

1
src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java
Unescape View File

@ -47,6 +47,7 @@ public class DmYppyzController {
public ResultBean<?> list(@RequestBody DmYppyz entity){
List<DmYppyz> list = service.list(Wrappers.<DmYppyz>lambdaQuery()
.eq(StrUtil.isNotEmpty(entity.getDcCh()), DmYppyz::getDcCh, entity.getDcCh())
.eq(StrUtil.isNotEmpty(entity.getDcPl()), DmYppyz::getDcPl, entity.getDcPl())
);
return new ResultBean<>(list);
}

35
src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java
Unescape View File

@ -0,0 +1,35 @@
package com.dsic.gj_erp.controller.zyjh;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("zyjh")
@AllArgsConstructor
public class GetXXXController {
private final DmDwxxpService dmDwxxpService;
private final DmYdjhLjService ydjhLjService;
@PostMapping("getYdjhlj")
public ResultBean<?> getYdjhlj(@RequestBody DmYdjhLj lj){
List<DmYdjhLj> list = ydjhLjService.list(Wrappers.<DmYdjhLj>lambdaQuery()
.eq(DmYdjhLj::getCzbh, lj.getCzbh())
.eq(StrUtil.isNotEmpty(lj.getPl()), DmYdjhLj::getPl, lj.getPl())
);
return new ResultBean<>(list);
}
@GetMapping("getBFangDwxx")
public ResultBean<?> getBFangDwxx(){
return new ResultBean<>(dmDwxxpService.getDwxxForSelect());
}
}

11
src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
Unescape View File

@ -59,6 +59,17 @@ public class ZyjhController {
private final MpDhsjServcie mpDhsjServcie;
/**
* 零件摆放
* @param list
* @return
*/
@PostMapping("ljbf")
public ResultBean<?> ljbf(@RequestBody List<DmYdjhLj> list){
return new ResultBean<>();
}
@GetMapping("getBzryByBz")
public ResultBean<?> getBzryByBz(String zyq, String zt){
return new ResultBean<>(zyjhService.getBzryByBz(zyq,zt));

12
src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java
Unescape View File

@ -7,15 +7,23 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
public Map<String,List<DmDwxxp>> getDwxxForSelect(){
List<DmDwxxp> list = this.list();
return list.stream().collect(Collectors.groupingBy(DmDwxxp::getQy));
}
@Transactional(rollbackFor = Exception.class)
public void saveOrEdit(List<DmDwxxp> list){
this.saveOrUpdateBatchByMultiId(list);
this.saveOrUpdateBatch(list);
}
public void remove(DmDwxxp dwxxp){
baseMapper.deleteByMultiId(dwxxp);
baseMapper.deleteById(dwxxp);
}
}

121
src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportNewService.java
Unescape View File

@ -75,18 +75,21 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
AtomicInteger 板数 = new AtomicInteger(0);
//一垮龙门和一垮数控
if (item.get切割完成1() != null) {
item.set一垮龙门板数("0");
this.getBomSize(item, "7",(size)->{
item.set二跨面板板数(size+"");
item.set一垮龙门板数(size+"");
板数.addAndGet(size);
});
item.set一垮数控板数("0");
this.getBomSize(item, "8",(size)->{
item.set二跨面板板数(size+"");
item.set一垮数控板数(size+"");
板数.addAndGet(size);
});
}
if (item.get切割完成2() != null) {
item.set二跨面板板数("0");
this.getBomSize(item, "5",(size)->{
item.set二跨面板板数(size+"");
板数.addAndGet(size);
@ -110,23 +113,27 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
atomicInteger.addAndGet(size);
板数.addAndGet(size);
});
item.set二跨数控板数("0");
item.set二跨数控板数(atomicInteger.toString());
}
if (item.get切割完成4() != null) {
item.set三跨平铁板数("0");
AtomicInteger atomicInteger = new AtomicInteger(0);
this.getBomSize(item, "6",(size)->{
item.set三跨平铁板数(size.toString());
atomicInteger.addAndGet(size);
板数.addAndGet(size);
});
this.getBomSize(item, "13", (size)->{
atomicInteger.addAndGet(size);
板数.addAndGet(size);
});
item.set三跨平铁板数(atomicInteger.toString());
}
if(item.get曲平铁曲完成()!=null){
this.getBomSize(item, "13", 板数::addAndGet);
}
if (item.get切割完成5() != null) {
if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
item.set三跨数控板数("0");
this.getBomSize(item, "14",(size)->{
item.set三跨数控板数(size+"");
板数.addAndGet(size);
@ -134,6 +141,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
}
if (item.get切割完成6() != null) {
item.set四区腹板板数("0");
this.getBomSize(item, "11",(size)->{
item.set四区腹板板数(size+"");
板数.addAndGet(size);
@ -148,16 +156,13 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
板数.addAndGet(size);
});
this.getBomSize(item, "16",(size)->{
atomicInteger.addAndGet(size);
板数.addAndGet(size);
});
item.set四区数控板数("0");
item.set四区数控板数(atomicInteger.toString());
}
if(item.get光电完成()!=null){
this.getBomSize(item, "17", 板数::addAndGet);
}
// if(item.get光电完成()!=null){
// this.getBomSize(item, "17", 板数::addAndGet);
// }
item.set板数(板数.toString());
});
@ -270,20 +275,16 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
updateList.add(dmYdjh);
});
});
}
if(item.get曲平铁曲完成()!=null){
Optional.ofNullable(collect.get("13")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get曲平铁曲完成());
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成4());
dmYdjh.setId(ydjh.getId());
updateList.add(dmYdjh);
});
});
}
if (item.get切割完成5() != null) {
if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
Optional.ofNullable(collect.get("14")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成5());
@ -312,14 +313,6 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
});
});
Optional.ofNullable(collect.get("16")).ifPresent(ydjhs -> {
ydjhs.forEach(ydjh->{
DmYdjh dmYdjh = this.updateYdjh(item.get上料完成(),item.get抛丸完成(),item.get切割完成7());
dmYdjh.setId(ydjh.getId());
updateList.add(dmYdjh);
});
});
}
if(item.get光电完成()!=null){
@ -335,6 +328,8 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
});
dmYdjhService.updateBatchById(updateList);
// redisTemplate.opsForHash().delete(GJSCGK_SYGDMX_KEY+fileName);
// redisTemplate.opsForHash().delete(GJSCGK_TZJH_KEY+fileName);
}
private DmYdjh updateYdjh(String slrq,String pwrq,String qgrq){
@ -403,8 +398,6 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
tzjhService.saveBatch(tzjhList);
return true;
});
// redisTemplate.opsForHash().delete(GJSCGK_SYGDMX_KEY+fileName);
// redisTemplate.opsForHash().delete(GJSCGK_TZJH_KEY+fileName);
}
private List<YdjhImportNew> updateData(LambdaQueryWrapper<YdjhImportNew> wrapper, Consumer<YdjhImportNew> handler) {
@ -516,7 +509,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成1());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -530,7 +523,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成1());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -546,7 +539,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成2());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -562,7 +555,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成3());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -576,7 +569,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成3());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -590,7 +583,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成3());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -606,34 +599,31 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成4());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
}
if(item.get曲平铁曲完成()!=null){
Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_13",boms.size());
boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get曲平铁曲完成());
dmSygdMx.setQgrq(item.get切割完成4());
dmSygdMx.setQbs("1");
dmSygdMx.setQjgrq(item.get曲外板曲完成());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setQjgrq(item.get曲平铁曲完成());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
}
if (item.get切割完成5() != null) {
if (item.get切割完成5() != null||item.get三跨数控板数()!=null) {
Optional.ofNullable(collect.get("14")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
boms.forEach(bom -> {
@ -641,12 +631,28 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成5());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
// Optional.ofNullable(collect.get("13")).ifPresent(boms -> {
// redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_14",boms.size());
// boms.forEach(bom -> {
// DmSygdMx dmSygdMx = new DmSygdMx();
// dmSygdMx.setDcCh(item.getDcCh());
// dmSygdMx.setDcPl(item.getDcPl());
// dmSygdMx.setQgrq(item.get切割完成5());
// dmSygdMx.setQbs("1");
// dmSygdMx.setQjgrq(item.get曲外板曲完成());
// dmSygdMx.setJssj(item.get小组配送完成());
// dmSygdMx.setGjjsDz(item.getQfxqrqdz());
// dmSygdMx.setBomData(bom);
// addList.add(dmSygdMx);
// });
// });
}
if (item.get切割完成6() != null) {
@ -657,7 +663,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成6());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
@ -673,26 +679,13 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成7());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
Optional.ofNullable(collect.get("16")).ifPresent(boms -> {
redisTemplate.opsForHash().put(GJSCGK_BOM_COUNT_KEY+item.getDcCh(), finalDcPl +"_16",boms.size());
boms.forEach(bom -> {
DmSygdMx dmSygdMx = new DmSygdMx();
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get切割完成7());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);
});
});
}
if(item.get光电完成()!=null){
@ -703,7 +696,7 @@ public class YdjhImportNewService extends ServiceImpl<YdjhImportNewMapper, YdjhI
dmSygdMx.setDcCh(item.getDcCh());
dmSygdMx.setDcPl(item.getDcPl());
dmSygdMx.setQgrq(item.get光电完成());
dmSygdMx.setJssj(item.getQfxqrqxz());
dmSygdMx.setJssj(item.get小组配送完成());
dmSygdMx.setGjjsDz(item.getQfxqrqdz());
dmSygdMx.setBomData(bom);
addList.add(dmSygdMx);

5
src/main/resources/mappers/jcsj/DmDwxxpMapper.xml
Unescape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmDwxxpMapper">
</mapper>
Write Preview
Loading…
Cancel
Save