From 200401abb35327a6278b6f0d382b4efaccc4ac21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 17 Mar 2026 09:55:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E9=A2=84=E5=88=87=E6=9D=BF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jcsj/YdjhzzController.java | 31 +++++++----- .../gj_erp/mapper/jcsj/DmBclqmxpMapper.java | 5 +- .../gj_erp/service/jcsj/DmBclqmxpService.java | 3 ++ .../jcsj/impl/DmBclqmxpServiceImpl.java | 48 +++++++++++-------- .../com/dsic/gj_erp/vo/预切板统计VO.java | 36 ++++++++++++++ .../mappers/jcsj/DmBclqmxpMapper.xml | 32 +++++++++++++ 6 files changed, 124 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/vo/预切板统计VO.java diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java index 9ce847f..8803d20 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java @@ -1,28 +1,21 @@ package com.dsic.gj_erp.controller.jcsj; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.StrUtil; -import com.dsic.gj_erp.annotation.AuthFunction; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.bean.ResultBean; -import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; -import com.dsic.gj_erp.bean.jcsj.EmSbwxjh; import com.dsic.gj_erp.bean.jcsj.Ydjhzz; -import com.dsic.gj_erp.bean.request.EmSbwxjhBean; +import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; -import com.dsic.gj_erp.service.jcsj.EmSbwxjhService; import com.dsic.gj_erp.service.jhgk.DmYdjhService; +import com.dsic.gj_erp.vo.预切板统计VO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -40,6 +33,22 @@ public class YdjhzzController { private final DmYdjhMapper mapper; private final DmBclqmxpService bclqmxpService; + private final DmYdjhService ydjhService; + + @PostMapping + public ResultBean yqbtjcx(@RequestBody Map map){ + List<预切板统计VO> list = bclqmxpService.预切板统计查询(map); + list.forEach(item->{ + //上料完成数量 + int count = ydjhService.count(Wrappers.lambdaQuery() + .eq(DmYdjh::getDcCh, item.getDcCh()) + .eq(DmYdjh::getDcPl, item.getDcPl()) + .ge(DmYdjh::getZt, 21) + ); + item.set上料完成(count+""); + }); + return new ResultBean<>(list); + } @ApiOperation(value = "查询") @PostMapping(value = "/getList") diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java index 91fd865..1aa1b4a 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.mapper.jcsj; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; +import com.dsic.gj_erp.vo.预切板统计VO; import java.util.List; import java.util.Map; @@ -17,6 +18,8 @@ import java.util.Map; public interface DmBclqmxpMapper extends BaseMapper { - public List getBcLQlList(Map map); + List getBcLQlList(Map map); + + List<预切板统计VO> 预切板统计查询(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java index 7ad6651..ba40437 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.service.jcsj; import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; +import com.dsic.gj_erp.vo.预切板统计VO; import java.util.List; import java.util.Map; @@ -20,4 +21,6 @@ public interface DmBclqmxpService extends IService { void dbs(String dcCh,List plList); + List<预切板统计VO> 预切板统计查询(Map map); + } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java index a612847..62389c5 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java @@ -1,21 +1,22 @@ package com.dsic.gj_erp.service.jcsj.impl; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.exception.ServiceException; import com.dsic.gj_erp.mapper.jcsj.DmBclqmxpMapper; import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; import com.dsic.gj_erp.util.ExcelUtil; +import com.dsic.gj_erp.vo.预切板统计VO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -62,24 +63,33 @@ public class DmBclqmxpServiceImpl extends ServiceImpl{ List strings = ExcelUtil.ReadExcelByLine(item); for (String _str:strings){ - if (_str.contains("*")){ - String[] split = _str.split(" "); - if (split.length<15){ - continue; - } - if ("*".equals(split[13])){ - try { - String tzbh=split[14]; - String wpgg=split[0]; - this.lambdaUpdate().set(DmBclqmxp::getBz,tzbh) - .eq(DmBclqmxp::getDcChZ,dcCh) - .eq(DmBclqmxp::getDcPlZ,pl) - .eq(DmBclqmxp::getWpgg,wpgg); - }catch (Exception ignored){} - } + if (!StrUtil.contains(_str,"*")){ + continue; + } + String[] split = _str.split(" "); + if (split.length<15){ + continue; + } + if (!StrUtil.equals("*",split[13])){ + continue; + } + try { + String tzbh=split[14]; + String wpgg=split[0]; + this.lambdaUpdate().set(DmBclqmxp::getBz,tzbh) + .eq(DmBclqmxp::getDcChZ,dcCh) + .eq(DmBclqmxp::getDcPlZ,pl) + .eq(DmBclqmxp::getWpgg,wpgg).update(); + }catch (Exception e){ + throw new ServiceException(12345,StrUtil.format("批量{}计算失败",pl)); } } }); }); } + + @Override + public List<预切板统计VO> 预切板统计查询(Map map) { + return baseMapper.预切板统计查询(map); + } } diff --git a/src/main/java/com/dsic/gj_erp/vo/预切板统计VO.java b/src/main/java/com/dsic/gj_erp/vo/预切板统计VO.java new file mode 100644 index 0000000..6caf3af --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/vo/预切板统计VO.java @@ -0,0 +1,36 @@ +package com.dsic.gj_erp.vo; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class 预切板统计VO { + + private String dcCh; + private String dcPl; + private String fds; + private String 批量板数; + private String 预切板数; + private String 上料完成; + private String 一跨龙门板数; + private String 龙门1预切板数; + private String 一跨数控板数; + private String 数1预切板数; + private String 二跨平铁板数; + private String 平铁预切板数; + private String 二跨数控板数; + private String 数控预切板数; + private String 三跨曲板板数; + private String 曲版预切板数; + private String 三跨厚板板数; + private String 厚板预切板数; + private String 四区腹板板数; + private String 腹板预切板数; + private String 四区数控板数; + private String 数4预切板数; + private String 七跨面板板数; + private String 面板预切板数; + private String 光电板数; + private String 光电预切板数; +} diff --git a/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml index 89590a0..b6a36db 100644 --- a/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml +++ b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml @@ -132,4 +132,36 @@ order by DM_BCLQJBP.dc_ch,DM_BCLQJBP.dc_pl,DM_BCLQJBP.dc_zl,DM_BCLQJBP.lqlb,DM_BCLQJBP.zzcj + +