From a498e6570ed7813d9951a492fd86edbd559cc439 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, 3 Feb 2026 13:45:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=202.=E5=A2=9E=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E5=88=87=E6=9D=BF=E8=B7=9F=E8=B8=AA=E8=AE=B0=E5=BD=95=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=8F=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=203.?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8E=9F=E6=9C=89=E8=B7=9F=E8=B8=AA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=8D=E5=86=8D=E6=9F=A5=E8=AF=A2=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=A2=84=E5=88=87=E6=9D=BF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java | 2 +- .../controller/jcsj/DmBzryController.java | 4 +- .../controller/jcsj/YdjhzzController.java | 39 ++- .../dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 5 + .../gj_erp/service/jcsj/DmBclqmxpService.java | 2 + .../jcsj/impl/DmBclqmxpServiceImpl.java | 38 +++ .../dsic/gj_erp/service/zyjh/ZyjhService.java | 4 +- .../resources/mappers/jhgk/DmYdjhMapper.xml | 227 +++++++++++++++++- 8 files changed, 312 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java index 6aa7942..3ca8179 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java @@ -203,7 +203,7 @@ public class DmBclqmxp implements Serializable { private BigDecimal ylzd10; @TableField("BZ") - private String bz; + private String bz;//在计算预切板中被占用,作为预切板跟踪记录 @TableField("YLZD7") private String ylzd7; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java index 9e5a929..5570450 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java @@ -133,9 +133,7 @@ public class DmBzryController { public ResultBean getBzryDel(@RequestBody List t, HttpServletRequest request){ String bzry= (String) request.getAttribute("yhms"); String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); - t.forEach(e->{ - service.removeById(e.getId()); - }); + t.forEach(e-> service.lambdaUpdate().set(DmBzry::getFlagStatus,"0")); return new ResultBean(); } 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 4b5bcf0..85b1ae8 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,20 +1,26 @@ package com.dsic.gj_erp.controller.jcsj; +import cn.hutool.core.util.StrUtil; import com.dsic.gj_erp.annotation.AuthFunction; 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.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 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; /** @@ -28,17 +34,44 @@ import java.util.List; @RestController @RequestMapping("/ydjhzz") @Api(tags = "月度计划追踪") +@AllArgsConstructor public class YdjhzzController { - @Autowired - private DmYdjhMapper mapper; + + private final DmYdjhMapper mapper; + private final DmBclqmxpService bclqmxpService; + + @ApiOperation(value = "查询") @PostMapping(value = "/getList") public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1) { - List list=mapper.getYdjhzz(ch,dcpl,dcpl1); + List list=mapper.getYdjhzz2(ch,dcpl,dcpl1,false); return new ResultBean(list); } + @ApiOperation(value = "预切板") + @PostMapping(value = "/getYqbList") + public ResultBean getYqbList(@RequestParam String ch,String dcpl,String dcpl1) { + List list=mapper.getYdjhzz2(ch,dcpl,dcpl1,true); + return new ResultBean<>(list); + } + + @ApiOperation(value = "计算预切板") + @PostMapping(value = "/dbs") + public ResultBean dbs(@RequestParam String ch,String dcpl,String dcpl1) { + + List dcPlList=null; + if (StrUtil.isAllEmpty(dcpl,dcpl1)){ + dcPlList = mapper.getAllDcPlByDcCh(ch,dcpl,dcpl1); + } + + if (dcPlList!=null){ + bclqmxpService.dbs(ch,dcPlList); + } + + List list=mapper.getYdjhzz2(ch,dcpl,dcpl1,true); + return new ResultBean<>(list); + } } diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index bf04e46..bdf9329 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -25,6 +25,8 @@ import java.util.Map; */ public interface DmYdjhMapper extends BaseMapper { + List getAllDcPlByDcCh(String dcCh,String dcpl,String dcpl1); + List getSljhWithDjh(SljhSearch search); int getNotPPLjCount(String dcch,String pl,String fd); @@ -88,6 +90,9 @@ public interface DmYdjhMapper extends BaseMapper { Map getMPSYCLJLJBP(String dcCh,String tzbh); List getYdjhzz(String ch,String dcpl,String dcpl1); + + List getYdjhzz2(String ch,String dcpl,String dcpl1,Boolean yqbFlag); + RjhDto getRjh(String date); RjhDto getSyRwc(String yf,Double num); RjhDto getByRjh(String yf,Double num); 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 775cb50..7ad6651 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 @@ -18,4 +18,6 @@ public interface DmBclqmxpService extends IService { ListgetBcLQlList(Map map); + void dbs(String dcCh,List plList); + } 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 b88c729..89d291e 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,13 +1,19 @@ package com.dsic.gj_erp.service.jcsj.impl; +import cn.hutool.core.io.FileUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; import com.dsic.gj_erp.mapper.jcsj.DmBclqmxpMapper; import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; +import com.dsic.gj_erp.util.ExcelUtil; 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; @@ -42,4 +48,36 @@ public class DmBclqmxpServiceImpl extends ServiceImpl plList) { + List list=new ArrayList<>(); + plList.forEach(pl->{ + String dirStr="static/"+dcCh+"/"+pl+"/其他"; + File fileDir = new File(dirStr); + String patternStr = pl + "批量钢材领取表"; + List fileList = FileUtil.loopFiles(fileDir); + fileList.stream() + .filter(file -> file.getName().contains(patternStr)) + .forEach(item->{ + List strings = ExcelUtil.ReadExcelByLine(item); + for (String _str:strings){ + if (_str.contains("*")){ + String[] split = _str.split(" "); + if ("*".equals(split[13])){ + try { + String tzbh=split[15]; + 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){} + } + } + } + }); + }); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 5c36377..a1b376a 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -293,7 +293,9 @@ public class ZyjhService extends ServiceImpl { public List getBzryByBz(String zyq,String bz){ return bzryService.list(Wrappers.lambdaQuery() - .eq(DmBzry::getResourcesCode, bz).eq(DmBzry::getZyq, zyq).orderByAsc(DmBzry::getUserName)); + .eq(DmBzry::getResourcesCode, bz) + .eq(DmBzry::getZyq, zyq).eq(DmBzry::getFlagStatus,"1") + .orderByAsc(DmBzry::getUserName)); } /** * 获取所有未处理批次 diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 7e952c3..0d6f54e 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1347,6 +1347,7 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} + + + + +