From 18ae8b15968e74051303f9dcab8dc825d8c64ac2 Mon Sep 17 00:00:00 2001 From: xhj Date: Thu, 23 Nov 2023 11:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/bean/jcsj/DmBom.java | 50 ++++++------ .../controller/pgd/PgdDhController.java | 37 ++++++++- .../controller/pgd/PgdPwjhController.java | 59 +++++++++++++- .../controller/pgd/PgdQgjhController.java | 61 ++++++++++++++- .../controller/pgd/PgdSljhController.java | 61 ++++++++++++++- .../controller/pgd/PgdTzjhController.java | 2 +- .../jcsj/impl/BomUploadServiceImpl.java | 78 ++++++++++++++++++- .../jcsj/impl/DmCzplpNewServiceImpl.java | 18 ++++- .../jhgk/impl/DmSygdMxServiceImpl.java | 4 +- .../dsic/gj_erp/service/pgd/PgdDhService.java | 9 +++ .../gj_erp/service/pgd/PgdDmjhService.java | 8 ++ .../gj_erp/service/pgd/PgdPkjhService.java | 7 ++ .../gj_erp/service/pgd/PgdPwjhService.java | 8 ++ .../gj_erp/service/pgd/PgdQgjhService.java | 11 +++ .../gj_erp/service/pgd/PgdQmjhService.java | 8 ++ .../gj_erp/service/pgd/PgdSljhService.java | 10 +++ .../service/pgd/impl/PgdDhServiceImpl.java | 54 ++++++++++++- .../service/pgd/impl/PgdDmjhServiceImpl.java | 13 ++++ .../service/pgd/impl/PgdPkjhServiceImpl.java | 13 ++++ .../service/pgd/impl/PgdPwjhServiceImpl.java | 53 +++++++++++++ .../service/pgd/impl/PgdQgjhServiceImpl.java | 75 ++++++++++++++++++ .../service/pgd/impl/PgdQmjhServiceImpl.java | 19 +++++ .../service/pgd/impl/PgdSljhServiceImpl.java | 57 ++++++++++++++ .../service/pgd/impl/PgdTzjhServiceImpl.java | 10 +-- 24 files changed, 679 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java index 94f424b..9c4cb51 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java @@ -74,7 +74,7 @@ public class DmBom implements Serializable { private BigDecimal bc; @ApiModelProperty(value = "油漆用量") - private Double yqyl; + private BigDecimal yqyl; @ApiModelProperty(value = "切割长度") private BigDecimal qgcd; @@ -97,13 +97,13 @@ public class DmBom implements Serializable { private String pkbs; @ApiModelProperty(value = "坡口标识") - private Double pkcd; + private BigDecimal pkcd; @ApiModelProperty(value = "打磨标识") private String dmbs; @ApiModelProperty(value = "打磨长度") - private Double dmcd; + private BigDecimal dmcd; @ApiModelProperty(value = "装配顺序") private Integer zpsx; @@ -118,64 +118,64 @@ public class DmBom implements Serializable { private String ljsx; @ApiModelProperty(value = "单件面积") - private Double djmj; + private BigDecimal djmj; @ApiModelProperty(value = "零件单重") - private Double ljdz; + private BigDecimal ljdz; @ApiModelProperty(value = "备料") - private Double blgs; + private BigDecimal blgs; @ApiModelProperty(value = "抛丸") - private Double pwgs; + private BigDecimal pwgs; @ApiModelProperty(value = "理料") - private Double llgs; + private BigDecimal llgs; @ApiModelProperty(value = "划线") - private Double hxgs; + private BigDecimal hxgs; @ApiModelProperty(value = "切割") - private Double qggs; + private BigDecimal qggs; @ApiModelProperty(value = "坡口") - private Double pkgs; + private BigDecimal pkgs; @ApiModelProperty(value = "曲") - private Double qgs; + private BigDecimal qgs; @ApiModelProperty(value = "打磨") - private Double dmgs; + private BigDecimal dmgs; @ApiModelProperty(value = "装配") - private Double zpgs; + private BigDecimal zpgs; @ApiModelProperty(value = "反馈备料") - private Double fkblgs; + private BigDecimal fkblgs; @ApiModelProperty(value = "抛丸") - private Double fkpwgs; + private BigDecimal fkpwgs; @ApiModelProperty(value = "理料") - private Double fkllgs; + private BigDecimal fkllgs; @ApiModelProperty(value = "划线") - private Double fkhxgs; + private BigDecimal fkhxgs; @ApiModelProperty(value = "切割") - private Double fkqggs; + private BigDecimal fkqggs; @ApiModelProperty(value = "坡口") - private Double fkpkgs; + private BigDecimal fkpkgs; @ApiModelProperty(value = "曲") - private Double fkqgs; + private BigDecimal fkqgs; @ApiModelProperty(value = "打磨") - private Double fkdmgs; + private BigDecimal fkdmgs; @ApiModelProperty(value = "装配") - private Double fkzpgs; + private BigDecimal fkzpgs; private Integer pid; @@ -214,6 +214,10 @@ public class DmBom implements Serializable { private String ylbhgg; + // 反馈工时 + private String fkgs; + + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java index f4e0879..f03a62f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdDhController.java @@ -3,14 +3,17 @@ package com.dsic.gj_erp.controller.pgd; 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.pgd.PgdTzjh; +import com.dsic.gj_erp.bean.pgd.PgdDh; +import com.dsic.gj_erp.bean.pgd.PgdDh; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.service.pgd.PgdDhService; 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; /** @@ -31,17 +34,43 @@ public class PgdDhController { @PostMapping("/getDhPgd") @ResponseBody public ResultBean getDhPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { - QueryWrapper qw =new QueryWrapper<>(); + QueryWrapper qw =new QueryWrapper<>(); - qw.eq(StrUtil.isNotEmpty((String)map.get("czbh")),"czbh",(String)map.get("dcch")); + qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch")); qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl")); qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd")); qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt")); qw.orderBy(true,true,"czbh","pl","fd"); - return new ResultBean(dhService.list()); + return new ResultBean(dhService.list(qw)); } + @PostMapping("/saveDhPgdXd") + @ResponseBody + @AuthFunction + public ResultBean saveDhPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + dhService.saveDhPgdXd(list,req); + return new ResultBean(); + } + + @PostMapping("/saveDhPgdXdBack") + @ResponseBody + @AuthFunction + public ResultBean saveDhPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + dhService.saveDhPgdXdBack(list,req); + return new ResultBean(); + } + + + + @PostMapping("/saveDhPgdFk") + @ResponseBody + @AuthFunction + public ResultBean saveDhPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + dhService.saveDhPgdFk(list,req); + return new ResultBean(); + } + } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java index 8324ebb..1c34558 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdPwjhController.java @@ -1,9 +1,20 @@ package com.dsic.gj_erp.controller.pgd; -import org.springframework.web.bind.annotation.RequestMapping; +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.pgd.PgdPwjh; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.pgd.PgdPwjhService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; /** *

@@ -16,6 +27,50 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/pgdPwjh") public class PgdPwjhController { + + @Autowired + PgdPwjhService pgdPwjhService; + + @PostMapping("/getPwPgd") + @ResponseBody + public ResultBean getPwPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + QueryWrapper qw =new QueryWrapper<>(); + + + qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch")); + qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl")); + qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd")); + qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt")); + qw.orderBy(true,true,"czbh","pl","fd"); + return new ResultBean(pgdPwjhService.list(qw)); + + } + + @PostMapping("/savePwPgdXd") + @ResponseBody + @AuthFunction + public ResultBean savePwPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdPwjhService.savePwPgdXd(list,req); + return new ResultBean(); + } + + @PostMapping("/savePwPgdXdBack") + @ResponseBody + @AuthFunction + public ResultBean savePwPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdPwjhService.savePwPgdXdBack(list,req); + return new ResultBean(); + } + + + + @PostMapping("/savePwPgdFk") + @ResponseBody + @AuthFunction + public ResultBean savePwPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdPwjhService.savePwPgdFk(list,req); + return new ResultBean(); + } } 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 be4ae85..3af4ece 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,9 +1,20 @@ package com.dsic.gj_erp.controller.pgd; -import org.springframework.web.bind.annotation.RequestMapping; +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.pgd.PgdQgjh; +import com.dsic.gj_erp.bean.pgd.PgdQgjh; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.pgd.PgdQgjhService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; /** *

@@ -16,6 +27,52 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/pgdQgjh") public class PgdQgjhController { + + + @Autowired + PgdQgjhService pgdQgjhService; + + + + @PostMapping("/getQgPgd") + @ResponseBody + public ResultBean getQgPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + QueryWrapper qw =new QueryWrapper<>(); + + qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch")); + qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl")); + qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd")); + qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt")); + qw.orderBy(true,true,"czbh","pl","fd"); + return new ResultBean(pgdQgjhService.list(qw)); + + } + + @PostMapping("/saveQgPgdXd") + @ResponseBody + @AuthFunction + public ResultBean saveQgPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdQgjhService.saveQgPgdXd(list,req); + return new ResultBean(); + } + + @PostMapping("/saveQgPgdXdBack") + @ResponseBody + @AuthFunction + public ResultBean saveQgPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdQgjhService.saveQgPgdXdBack(list,req); + return new ResultBean(); + } + + + + @PostMapping("/saveQgPgdFk") + @ResponseBody + @AuthFunction + public ResultBean saveQgPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdQgjhService.saveQgPgdFk(list,req); + return new ResultBean(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index fb8fde7..eb195cc 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -1,9 +1,20 @@ package com.dsic.gj_erp.controller.pgd; -import org.springframework.web.bind.annotation.RequestMapping; +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.pgd.PgdSljh; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.pgd.PgdSljhService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; /** *

@@ -16,6 +27,52 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/pgdSljh") public class PgdSljhController { + + + @Autowired + PgdSljhService pgdSljhService; + + + @PostMapping("/getSljhPgd") + @ResponseBody + public ResultBean getSljhPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + QueryWrapper qw =new QueryWrapper<>(); + + + qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch")); + qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl")); + qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd")); + qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt")); + qw.orderBy(true,true,"czbh","pl","fd"); + return new ResultBean(pgdSljhService.list(qw)); + + } + + @PostMapping("/saveSljhPgdXd") + @ResponseBody + @AuthFunction + public ResultBean saveSljhPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdSljhService.saveSljhPgdXd(list,req); + return new ResultBean(); + } + + @PostMapping("/saveSljhPgdXdBack") + @ResponseBody + @AuthFunction + public ResultBean saveSljhPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdSljhService.saveSljhPgdXdBack(list,req); + return new ResultBean(); + } + + + + @PostMapping("/saveSljhPgdFk") + @ResponseBody + @AuthFunction + public ResultBean saveSljhPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { + pgdSljhService.saveSljhPgdFk(list,req); + return new ResultBean(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java index 024f79b..c59cc46 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java @@ -48,7 +48,7 @@ public class PgdTzjhController { qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd")); qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",(String)map.get("zt")); qw.orderBy(true,true,"czbh","pl","fd"); - return new ResultBean(pgdTzjhService.list()); + return new ResultBean(pgdTzjhService.list(qw)); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index 4679ebd..f2769aa 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -85,6 +85,28 @@ public class BomUploadServiceImpl { int ldpt = 1; String czbh1 = ""; String pl1 = ""; + + + List oloList = dmBomService.list(new QueryWrapper().eq("dcch", czbh) + .eq("pl", pl) + ); + Boolean delfag=false; + for(DmBom e:oloList){ + if("Y".equals(e.getFkgs())){ + delfag=true; + break; + } + } + + + if (delfag) { + throw new CustomException(10106,"不能重新导入请联系管理员"); + } + + + + + // List list = dmBomService.list(new QueryWrapper().eq("sjch", czbh) // .eq(StrUtil.isNotEmpty((String) pl), "pl",pl) // ); @@ -1385,8 +1407,19 @@ public class BomUploadServiceImpl { List oloList = dmBomService.list(new QueryWrapper().eq("dcch", czbh) .eq("pl", pl) ); - if (oloList.size() > 0) { + Boolean delfag=true; + for(DmBom e:oloList){ + if("Y".equals(e.getFkgs())){ + delfag=false; + break; + } + } + + if (oloList.size() > 0 && delfag ) { + dmBomService.remove(new QueryWrapper().eq("dcch", czbh).eq("pl", pl)); + } else if (!delfag) { + throw new CustomException(10106,"不能重新导入请联系管理员"); } } // Map querMap= new HashMap(); @@ -1579,11 +1612,54 @@ public class BomUploadServiceImpl { }); + } + // 根据 adds 去找工时定 导入bom时候 根据目标船只的定额数据 给上值 + // 切割之前的定额 船号，批量，组立，跨位，规格，领取类别 + // 切割之后 零件，规格 + + DmCbxxp cbbm = dmCbxxpService.getOne(new QueryWrapper().eq("cbbm", czbh)); + if(StringUtils.isNotBlank(cbbm.getSCzbh())){ + List oldList = dmBomService.list(new QueryWrapper().eq("dcch", cbbm.getSCzbh()) + .eq("pl", pl).eq("fkgs","Y") + ); + for(DmBom dmBom :adds){ + DmBom dmBom1 = oldList.stream().filter(fst -> fst.getDcch().equals(dmBom.getDcch()) && fst.getPl().equals(dmBom.getPl()) && + fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && + fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && + fst.getLqlb().equals(dmBom.getLqlb()) + ).findFirst().orElse(null); + if(null!=dmBom1){ + dmBom.setFkblgs(dmBom1.getFkblgs()); + dmBom.setFkpwgs(dmBom1.getFkpwgs()); + dmBom.setFkllgs(dmBom1.getFkllgs()); + dmBom.setFkhxgs(dmBom1.getFkhxgs()); + dmBom.setFkqggs(dmBom1.getFkqggs()); + dmBom.setFkzpgs(dmBom1.getFkzpgs()); + } + DmBom dmBom2 = oldList.stream().filter(fst -> fst.getDcch().equals(dmBom.getDcch()) && fst.getPl().equals(dmBom.getPl()) && + fst.getZl().equals(dmBom.getZl()) && fst.getKw().equals(dmBom.getKw()) && + fst.getWpgg().equals(dmBom.getWpgg()) && fst.getWpcz().equals(dmBom.getWpcz()) && + fst.getLqlb().equals(dmBom.getLqlb()) &&fst.getTzbh().equals(dmBom.getTzbh())&& + fst.getLjbh().equals(dmBom.getLjbh()) + ).findFirst().orElse(null); + if(null!=dmBom2){ + dmBom.setFkpkgs(dmBom2.getFkpkgs()); + dmBom.setFkqgs(dmBom2.getFkqgs()); + dmBom.setFkdmgs(dmBom2.getFkdmgs()); + } + + } + } dmBomService.insertBoms(adds); return adds; } + + + + + // 根据套料图号得到组立信息。 public String getZL(String tzbh) { String bh = tzbh.substring(6, 8); diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index 688eb9d..bd3aa17 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java @@ -60,7 +60,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl list, String project, String isupload, HttpServletRequest req) { Map returnMap = new HashMap(); List pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList()); - List fdList = this.list(new QueryWrapper().in("dc_pl", pls)); + List fdList = this.list(new QueryWrapper().in("dc_pl", pls).eq("dc_ch",list.get(0).getDcCh())); // if(fdList.size()>0){ // // 是否覆盖之前导入的数据 // if(!isupload.equals("01")){ @@ -77,9 +77,10 @@ public class DmCzplpNewServiceImpl extends ServiceImpl stringObjectMap = BeanUtil.beanToMap(plExcel); DmCzplpNew dmCzplpNewOld = fdList.stream().filter(fst -> plExcel.getDcPL().equals(fst.getDcPl())).findFirst().orElse(null); - + // 把批量补0 + plExcel.setDcPL(String.format("%03d",Integer.parseInt(plExcel.getDcPL()))); if (null != dmCzplpNewOld) { - this.remove(new QueryWrapper().eq("dc_pl", plExcel.getDcPL())); + this.remove(new QueryWrapper().eq("dc_pl", plExcel.getDcPL()).eq("dc_ch",plExcel.getDcCh())); for (int i = 1; i list= dmCbxxpService.list(new QueryWrapper() + .select("cbbm","cbmc") + .eq("wgbs","N") + ); + List pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getCbbm())).map(DmCbxxp::getCbbm).collect(Collectors.toList()); + qw.in("dc_ch",pls); + } + + List list = this.list(qw); return list; } 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 46e053a..9d65bc7 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 @@ -248,7 +248,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i //切割人员 //切割日期 mx.setPklx(b.getPklx()); - mx.setPkcd(b.getPkcd()); + // mx.setPkcd(b.getPkcd()); //坡口设备 //坡口人员 //坡口日期 @@ -256,7 +256,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i //曲加工设备 //曲加工人员 //曲加工日期 - mx.setDmcd(b.getDmcd()); + // mx.setDmcd(b.getDmcd()); //打磨设备 //打磨人员 //打磨日期 diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java index 2eda979..5961366 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDhService.java @@ -2,6 +2,10 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.PgdDh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -13,4 +17,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdDhService extends IService { + void saveDhPgdXd(List pgdDhs, HttpServletRequest request); + void saveDhPgdFk(List pgdDhs, HttpServletRequest request); + void saveDhPgdXdBack(List pgdDhs, HttpServletRequest request); + + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java index bccc5b8..82c4f59 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdDmjhService.java @@ -2,6 +2,10 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdPkjh; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdDmjhService extends IService { + void saveDmPgdXd(List dmjhs, HttpServletRequest request); + void saveDmPgdFk(List dmjhs, HttpServletRequest request); + void saveDmPgdXdBack(List dmjhs, HttpServletRequest request); + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java index ba66823..44999d2 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPkjhService.java @@ -2,6 +2,10 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdQmjh; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -12,5 +16,8 @@ import com.baomidou.mybatisplus.extension.service.IService; * @since 2023-11-13 */ public interface PgdPkjhService extends IService { + void savePkPgdXd(List pkjhs, HttpServletRequest request); + void savePkPgdFk(List pkjhs, HttpServletRequest request); + void savePkPgdXdBack(List pkjhs, HttpServletRequest request); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java index 8040d77..7179ac6 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdPwjhService.java @@ -1,8 +1,12 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.pgd.PgdDh; import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 服务类 @@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdPwjhService extends IService { + void savePwPgdXd(List pwjhs, HttpServletRequest request); + void savePwPgdFk(List pwjhs, HttpServletRequest request); + void savePwPgdXdBack(List pwjhs, HttpServletRequest request); + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java index 2cfa8fd..f59a97f 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQgjhService.java @@ -1,8 +1,12 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 服务类 @@ -13,4 +17,11 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdQgjhService extends IService { + void saveQgPgdXd(List qgjhs, HttpServletRequest request); + void saveQgPgdFk(List qgjhs, HttpServletRequest request); + void saveQgPgdXdBack(List qgjhs, HttpServletRequest request); + void qgToQm(List qgjhs, HttpServletRequest request); + void qgToPk(List qgjhs, HttpServletRequest request); + void qgToDm(List qgjhs, HttpServletRequest request); + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java index fd8187a..228d924 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java @@ -1,8 +1,12 @@ package com.dsic.gj_erp.service.pgd; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQmjh; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 服务类 @@ -13,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdQmjhService extends IService { + void saveQmPgdXd(List qmjhs, HttpServletRequest request); + void savQmPgdFk(List qmjhs, HttpServletRequest request); + void saveQmPgdXdBack(List qmjhs, HttpServletRequest request); + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java index b86c476..a71280d 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/PgdSljhService.java @@ -2,6 +2,10 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.baomidou.mybatisplus.extension.service.IService; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -13,4 +17,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface PgdSljhService extends IService { + + void saveSljhPgdXd(List sljhs, HttpServletRequest request); + void saveSljhPgdFk(List sljhs, HttpServletRequest request); + void saveSljhPgdXdBack(List sljhs, HttpServletRequest request); + + } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java index 51f6817..9b306e9 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDhServiceImpl.java @@ -1,10 +1,18 @@ package com.dsic.gj_erp.service.pgd.impl; +import cn.hutool.core.date.DateUtil; import com.dsic.gj_erp.bean.pgd.PgdDh; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.mapper.pgd.PgdDhMapper; import com.dsic.gj_erp.service.pgd.PgdDhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** *

@@ -16,5 +24,49 @@ import org.springframework.stereotype.Service; */ @Service public class PgdDhServiceImpl extends ServiceImpl implements PgdDhService { - + @Transactional(rollbackFor = Exception.class) + @Override + public void saveDhPgdXd(List pgdDhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pgdDhs.forEach(f->{ + PgdDh e= new PgdDh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Transactional(rollbackFor = Exception.class) + @Override + public void saveDhPgdFk(List pgdDhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pgdDhs.forEach(f->{ + PgdDh e= new PgdDh(); + e.setFkry((String) request.getAttribute("yhms")); + e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("09"); + e.setFkyy(f.getFkyy()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Transactional(rollbackFor = Exception.class) + @Override + public void saveDhPgdXdBack(List pgdDhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pgdDhs.forEach(f->{ + PgdDh e= new PgdDh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getZt().equals("02")){ + e.setZt("01"); + } + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java index 388a754..655ba89 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java @@ -6,6 +6,9 @@ import com.dsic.gj_erp.service.pgd.PgdDmjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 服务实现类 @@ -16,5 +19,15 @@ import org.springframework.stereotype.Service; */ @Service public class PgdDmjhServiceImpl extends ServiceImpl implements PgdDmjhService { + @Override + public void saveDmPgdXd(List dmjhs, HttpServletRequest request) { + } + + @Override + public void saveDmPgdFk(List dmjhs, HttpServletRequest request) { + } + @Override + public void saveDmPgdXdBack(List dmjhs, HttpServletRequest request) { + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java index 2a7a6ae..98e1853 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java @@ -6,6 +6,9 @@ import com.dsic.gj_erp.service.pgd.PgdPkjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** *

* 服务实现类 @@ -16,5 +19,15 @@ import org.springframework.stereotype.Service; */ @Service public class PgdPkjhServiceImpl extends ServiceImpl implements PgdPkjhService { + @Override + public void savePkPgdXd(List pkjhs, HttpServletRequest request) { + } + + @Override + public void savePkPgdFk(List pkjhs, HttpServletRequest request) { + } + @Override + public void savePkPgdXdBack(List pkjhs, HttpServletRequest request) { + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java index 51e7c57..172e526 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPwjhServiceImpl.java @@ -1,10 +1,17 @@ package com.dsic.gj_erp.service.pgd.impl; +import cn.hutool.core.date.DateUtil; import com.dsic.gj_erp.bean.pgd.PgdPwjh; +import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.dsic.gj_erp.mapper.pgd.PgdPwjhMapper; import com.dsic.gj_erp.service.pgd.PgdPwjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; /** *

@@ -16,5 +23,51 @@ import org.springframework.stereotype.Service; */ @Service public class PgdPwjhServiceImpl extends ServiceImpl implements PgdPwjhService { + @Override + @Transactional(rollbackFor = Exception.class) + public void savePwPgdXd(List pwjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pwjhs.forEach(f->{ + PgdPwjh e= new PgdPwjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void savePwPgdFk(List pwjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pwjhs.forEach(f->{ + PgdPwjh e= new PgdPwjh(); + e.setFkry((String) request.getAttribute("yhms")); + e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("09"); + e.setFkyy(f.getFkyy()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + @Override + @Transactional(rollbackFor = Exception.class) + public void savePwPgdXdBack(List pwjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + pwjhs.forEach(f->{ + PgdPwjh e= new PgdPwjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getZt().equals("02")){ + e.setZt("01"); + } + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java index e888793..1d4d3e0 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQgjhServiceImpl.java @@ -1,10 +1,18 @@ package com.dsic.gj_erp.service.pgd.impl; +import cn.hutool.core.date.DateUtil; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdQgjh; +import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.dsic.gj_erp.mapper.pgd.PgdQgjhMapper; import com.dsic.gj_erp.service.pgd.PgdQgjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; /** *

@@ -16,5 +24,72 @@ import org.springframework.stereotype.Service; */ @Service public class PgdQgjhServiceImpl extends ServiceImpl implements PgdQgjhService { + @Override + @Transactional(rollbackFor = Exception.class) + public void saveQgPgdXd(List qgjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + qgjhs.forEach(f->{ + PgdQgjh e= new PgdQgjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveQgPgdFk(List qgjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + qgjhs.forEach(f->{ + PgdQgjh e= new PgdQgjh(); + e.setFkry((String) request.getAttribute("yhms")); + e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("09"); + e.setFkyy(f.getFkyy()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveQgPgdXdBack(List qgjhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + qgjhs.forEach(f->{ + PgdQgjh e= new PgdQgjh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getZt().equals("02")){ + e.setZt("01"); + } + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + /** + * 切割去曲面 //todo + * @param qgjhs + * @param request + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void qgToQm(List qgjhs, HttpServletRequest request) { + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void qgToPk(List qgjhs, HttpServletRequest request) { + } + @Override + @Transactional(rollbackFor = Exception.class) + public void qgToDm(List qgjhs, HttpServletRequest request) { + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java index baeca9f..cab7f2c 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java @@ -5,6 +5,10 @@ import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper; import com.dsic.gj_erp.service.pgd.PgdQmjhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -16,5 +20,20 @@ import org.springframework.stereotype.Service; */ @Service public class PgdQmjhServiceImpl extends ServiceImpl implements PgdQmjhService { + @Override + @Transactional(rollbackFor = Exception.class) + public void saveQmPgdXd(List qmjhs, HttpServletRequest request) { + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void savQmPgdFk(List qmjhs, HttpServletRequest request) { + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveQmPgdXdBack(List qmjhs, HttpServletRequest request) { + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java index f7eb6cd..8231927 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdSljhServiceImpl.java @@ -1,10 +1,18 @@ package com.dsic.gj_erp.service.pgd.impl; +import cn.hutool.core.date.DateUtil; +import com.dsic.gj_erp.bean.pgd.PgdDh; import com.dsic.gj_erp.bean.pgd.PgdSljh; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.mapper.pgd.PgdSljhMapper; import com.dsic.gj_erp.service.pgd.PgdSljhService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; /** *

@@ -16,5 +24,54 @@ import org.springframework.stereotype.Service; */ @Service public class PgdSljhServiceImpl extends ServiceImpl implements PgdSljhService { + @Transactional(rollbackFor = Exception.class) + @Override + public void saveSljhPgdXd(List sljhs, HttpServletRequest request) { + + Listups= new ArrayList<>(); + sljhs.forEach(f->{ + PgdSljh e= new PgdSljh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("02"); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveSljhPgdFk(List sljhs, HttpServletRequest request) { + + Listups= new ArrayList<>(); + sljhs.forEach(f->{ + PgdSljh e= new PgdSljh(); + e.setFkry((String) request.getAttribute("yhms")); + e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("09"); + e.setFkyy(f.getFkyy()); + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveSljhPgdXdBack(List sljhs, HttpServletRequest request) { + Listups= new ArrayList<>(); + sljhs.forEach(f->{ + PgdSljh e= new PgdSljh(); + e.setXfry((String) request.getAttribute("yhms")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + if(f.getZt().equals("02")){ + e.setZt("01"); + } + e.setId(f.getId()); + ups.add(e); + }); + this.updateBatchById(ups); + } } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java index 262c70a..f37597e 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java @@ -32,7 +32,7 @@ public class PgdTzjhServiceImpl extends ServiceImpl impl tzjhs.forEach(f->{ PgdTzjh e= new PgdTzjh(); e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); e.setZt("02"); e.setId(f.getId()); ups.add(e); @@ -47,22 +47,22 @@ public class PgdTzjhServiceImpl extends ServiceImpl impl tzjhs.forEach(f->{ PgdTzjh e= new PgdTzjh(); e.setFkry((String) request.getAttribute("yhms")); - e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); - e.setZt("99"); + e.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); + e.setZt("09"); e.setFkyy(f.getFkyy()); e.setId(f.getId()); ups.add(e); }); this.updateBatchById(ups); } - + @Transactional(rollbackFor = Exception.class) @Override public void saveTzjhPgdXdBack(List tzjhs, HttpServletRequest request) { Listups= new ArrayList<>(); tzjhs.forEach(f->{ PgdTzjh e= new PgdTzjh(); e.setXfry((String) request.getAttribute("yhms")); - e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + e.setXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); if(f.getZt().equals("02")){ e.setZt("01"); }