From 783c20a66dd75020498943869e26cfb9332787b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 13 Dec 2024 17:55:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=82=89=E6=89=B9=E5=8F=B7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=B0=E5=BD=95=202.=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E6=83=85?= =?UTF-8?q?=E5=86=B5=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 4 ++- .../controller/pgd/PgdQgjhController.java | 27 +++++++++++++++++-- .../com/dsic/gj_erp/mapper/KbanMapper.java | 1 + .../com/dsic/gj_erp/service/KbanService.java | 11 +++++++- .../jhgk/impl/DmSygdMxServiceImpl.java | 10 +++++++ .../resources/mappers/kban/KbanMapper.xml | 26 +++++++++++++----- 6 files changed, 68 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 77d32e0..fd7542b 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -367,6 +367,9 @@ public class DmYdjh implements Serializable { private String kcbs; // 库存标识 + private String lphqrry; + private String lphqrrq; + @TableField(exist = false) private Long bs; @@ -383,7 +386,6 @@ public class DmYdjh implements Serializable { @TableField(exist = false) private Long qgCount; - public String getUniqueData(){ return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh); } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java index 2916ff2..1a6a8db 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQgjhController.java @@ -1,19 +1,23 @@ package com.dsic.gj_erp.controller.pgd; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.service.pgd.PgdQgjhService; +import com.dsic.gj_erp.service.zyjh.ZyjhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -27,10 +31,29 @@ import java.util.Map; @RequestMapping("/pgdQgjh") public class PgdQgjhController { - @Autowired PgdQgjhService pgdQgjhService; - + + @Autowired + ZyjhService zyjhService; + + @PostMapping("comLph") + @AuthFunction + public ResultBean comLph(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + String yhdm = (String) req.getAttribute("yhdm"); + String date= DateUtil.date().toString("yyyy/MM/dd"); + List collect = list.stream().map(item -> { + DmYdjh dmYdjh = new DmYdjh(); + dmYdjh.setId(item.getId()); + dmYdjh.setLphqrry(yhdm); + dmYdjh.setLphqrrq(date); + return dmYdjh; + }).collect(Collectors.toList()); + + zyjhService.updateBatchById(collect); + + return new ResultBean(); + } @PostMapping("/getQgPgd") diff --git a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java index edd468e..047eef3 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java @@ -38,6 +38,7 @@ public interface KbanMapper { String qfxq(String from, String to); List> qfxqDetail(String from, String to); + List> qfxqDetail1(String from, String to); List> qfxqWcqk(String from, String to); diff --git a/src/main/java/com/dsic/gj_erp/service/KbanService.java b/src/main/java/com/dsic/gj_erp/service/KbanService.java index e7f24e3..45cc582 100644 --- a/src/main/java/com/dsic/gj_erp/service/KbanService.java +++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java @@ -97,8 +97,17 @@ public class KbanService { DateTime date = DateUtil.date(); String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd"); - String xq=kbanMapper.qfxq(from,to); + BigDecimal xq=kbanMapper.xqzl(from, to);; List> list=kbanMapper.qfxqDetail(from,to); + List> list1=kbanMapper.qfxqDetail1(from,to); + + for (Map map:list){ + for (Map map1:list1){ + if(map.get("dcCh").equals(map1.get("dcCh"))){ + map.put("pcsl",map1.get("pcsl")); + } + } + } Map map=new HashMap<>(); map.put("xq", xq); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 3ce28d1..e3f7d8c 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -119,11 +119,21 @@ public class DmSygdMxServiceImpl extends ServiceImpl i ); if (dmYdjh != null){ dmYdjh.setId(dmYdjh.getId()); + + //计划日期 dmYdjh.setJssj(item.getJssj()); dmYdjh.setSljhrq(item.getSlrq()); dmYdjh.setPwjhrq(item.getPwrq()); dmYdjh.setHxjhrq(item.getHxrq()); dmYdjh.setQgjhrq(item.getQgrq()); + + //重量 + dmYdjh.setBclqzl(item.getBclqzl()); + dmYdjh.setBcshzl(item.getBcshzl()); + dmYdjh.setBcylzl(item.getBcylzl()); + dmYdjh.setBcljtlzl(item.getBcljtlzl()); + + //比对数据 dmYdjh.setXzglxq(dmYdjh.getJssj()); if (StrUtil.isAllNotEmpty(dmYdjh.getXzglxq(),dmYdjh.getJssj())){ //状态 2拖期 1提前 3追加 diff --git a/src/main/resources/mappers/kban/KbanMapper.xml b/src/main/resources/mappers/kban/KbanMapper.xml index c2f3e7f..e0db5d6 100644 --- a/src/main/resources/mappers/kban/KbanMapper.xml +++ b/src/main/resources/mappers/kban/KbanMapper.xml @@ -115,14 +115,22 @@ + + @@ -230,8 +238,12 @@