From 384d928bb89647602f220222dfa75391a32eeb77 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, 19 Dec 2023 15:59:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E5=92=8C=E5=89=8D?= =?UTF-8?q?=E6=96=B9=E9=9C=80=E6=B1=82=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 ++ .../com/dsic/gj_erp/bean/pgd/DmPpxxb.java | 9 ++- .../gj_erp/controller/jhgk/YppController.java | 75 ++++++++++++++++++- .../controller/pgd/DmPpxxbController.java | 3 +- .../dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java | 7 +- .../gj_erp/service/pgd/DmPpxxbService.java | 3 +- .../service/pgd/impl/DmPpxxbServiceImpl.java | 4 +- .../mappers}/pgd/DmPpxxbMapper.xml | 17 ++++- 8 files changed, 106 insertions(+), 17 deletions(-) rename src/main/{java/com/dsic/gj_erp/mapper => resources/mappers}/pgd/DmPpxxbMapper.xml (87%) diff --git a/pom.xml b/pom.xml index 27ff558..78cc97b 100644 --- a/pom.xml +++ b/pom.xml @@ -233,6 +233,11 @@ 2.3.5 + diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java index daeca42..6e3c008 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -159,8 +161,8 @@ public class DmPpxxb implements Serializable { @TableField("YLZD3") private String ylzd3; - @TableId(value = "XWH", type = IdType.ASSIGN_UUID) - private Double xwh; + @MppMultiId(value = "XWH") + private String xwh; @TableField("YLZD9") private String ylzd9; @@ -213,7 +215,8 @@ public class DmPpxxb implements Serializable { @TableField("LCM4") private String lcm4; - @TableField("FXWPH") + + @MppMultiId("FXWPH") private String fxwph; @TableField("WPCC") diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java index aa041aa..9c29439 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java @@ -10,11 +10,14 @@ import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper; import com.dsic.gj_erp.service.jhgk.DmQfxqService; import com.dsic.gj_erp.service.pgd.DmPpxxbService; import lombok.AllArgsConstructor; +import org.modelmapper.ModelMapper; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,18 +36,22 @@ public class YppController { String existsSql="select dc_ch,dc_pl,dc_fd from dm_ppxxb "; StringBuilder builder=new StringBuilder(existsSql); builder.append("where dc_ch=").append("'").append(qfxq.getDcCh()).append("'"); + builder.append(" and dm_qfxq.dc_ch=").append("dm_ppxxb.dc_ch"); + builder.append(" and dm_qfxq.dc_pl=").append("dm_ppxxb.dc_pl"); + builder.append(" and dm_qfxq.dc_fd=").append("dm_ppxxb.dc_fd"); if (StrUtil.isNotEmpty(qfxq.getDcPl())){ - builder.append(" dc_pl=").append("'").append(qfxq.getDcPl()).append("'"); + builder.append(" and dc_pl=").append("'").append(qfxq.getDcPl()).append("'"); } if (StrUtil.isNotEmpty(qfxq.getDcFd())){ - builder.append(" dc_fd=").append("'").append(qfxq.getDcFd()).append("'"); + builder.append(" and dc_fd=").append("'").append(qfxq.getDcFd()).append("'"); } + builder.append(" group by dc_ch,dc_pl,dc_fd"); List list = qfxqService.list(Wrappers.lambdaQuery() .eq(DmQfxq::getDcCh, qfxq.getDcCh()) .eq(StrUtil.isNotEmpty(qfxq.getDcPl()),DmQfxq::getDcPl, qfxq.getDcPl()) .eq(StrUtil.isNotEmpty(qfxq.getDcFd()),DmQfxq::getDcFd, qfxq.getDcFd()) - .eq(DmQfxq::getZt,"") + .eq(StrUtil.isNotEmpty(qfxq.getZt()),DmQfxq::getZt,qfxq.getZt()) .notExists(builder.toString()) ); return new ResultBean<>(list); @@ -52,10 +59,16 @@ public class YppController { @PostMapping("getLjxx") public ResultBean getLjxx(@RequestBody Map map){ - List dmYdjhLj = ppxxbMapper.getDmYdjhLj(map); + List dmYdjhLj = ppxxbMapper.getDmWlqd(map); return new ResultBean<>(dmYdjhLj); } + @PostMapping("getPpxx") + public ResultBean getPpxx(@RequestBody Map map){ + List dmPpxxb = ppxxbMapper.getDmPpxxb(map); + return new ResultBean<>(dmPpxxb); + } + @PostMapping("getList") public ResultBean getList(@RequestBody DmPpxxb dmPpxxb){ List list = ppxxbService.list(Wrappers.lambdaQuery() @@ -74,4 +87,58 @@ public class YppController { return new ResultBean<>(); } + + @PostMapping("qtjc") + public ResultBean qtjc(@RequestBody List list){ + list.forEach(item->{ + ModelMapper modelMapper = new ModelMapper(); + Map map = modelMapper.map(item, Map.class); + List dmYdjhLj = ppxxbMapper.getDmWlqd(map); + List dmPpxxb = ppxxbMapper.getDmPpxxb(map); + + if (dmPpxxb.size()==0){ + throw new RuntimeException(item.getDcFd()+"分段未预配盘"); + } + + dmYdjhLj.forEach(_item->{ + //todo 校验完工 + }); + + dmPpxxb.forEach(_item->item.setZt("01")); + ppxxbService.updateBatchByMultiId(dmPpxxb); + }); + return new ResultBean<>(); + } + + @PostMapping("zx") + @Transactional(rollbackFor = Exception.class) + public ResultBean zx(@RequestBody List list){ + List printData=new ArrayList<>(); + list.forEach(item->{ + ModelMapper modelMapper = new ModelMapper(); + Map map = modelMapper.map(item, Map.class); + List dmPpxxb = ppxxbMapper.getDmPpxxb(map); + dmPpxxb.forEach(_item->{ + item.setZt("04"); + }); + ppxxbService.updateBatchById(dmPpxxb); + printData.addAll(dmPpxxb); + }); + return new ResultBean<>(printData); + } + + @PostMapping("qr") + @Transactional(rollbackFor = Exception.class) + public ResultBean qr(@RequestBody List list){ + list.forEach(item->{ + ModelMapper modelMapper = new ModelMapper(); + Map map = modelMapper.map(item, Map.class); + List dmPpxxb = ppxxbMapper.getDmPpxxb(map); + dmPpxxb.forEach(_item->{ + item.setZt("05"); + }); + ppxxbService.updateBatchById(dmPpxxb); + }); + return new ResultBean<>(); + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java index 30da669..0af7fc9 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java @@ -46,7 +46,8 @@ public class DmPpxxbController { @PostMapping("saveDmppxxb") @Transactional(rollbackFor = Exception.class) public ResultBean save(@RequestBody List list){ - ppxxbService.saveOrUpdateBatch(list); + list.forEach(item->item.setZt("00")); + ppxxbService.saveOrUpdateBatchByMultiId(list); return new ResultBean<>(); } diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java index ad32e40..4c4bfe4 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java @@ -3,6 +3,7 @@ package com.dsic.gj_erp.mapper.pgd; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.DmPpxxb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import java.util.List; import java.util.Map; @@ -15,7 +16,9 @@ import java.util.Map; * @author xn * @since 2023-12-14 */ -public interface DmPpxxbMapper extends BaseMapper { +public interface DmPpxxbMapper extends MppBaseMapper { - List getDmYdjhLj(Map map); + List getDmWlqd(Map map); + + List getDmPpxxb(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java b/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java index 466d1bf..c4c712b 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/DmPpxxbService.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.service.pgd; import com.dsic.gj_erp.bean.pgd.DmPpxxb; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.jeffreyning.mybatisplus.service.IMppService; /** *

@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author xn * @since 2023-12-14 */ -public interface DmPpxxbService extends IService { +public interface DmPpxxbService extends IMppService { } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/DmPpxxbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/DmPpxxbServiceImpl.java index bcf1dc6..86f2099 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/DmPpxxbServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/DmPpxxbServiceImpl.java @@ -3,7 +3,7 @@ package com.dsic.gj_erp.service.pgd.impl; import com.dsic.gj_erp.bean.pgd.DmPpxxb; import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper; import com.dsic.gj_erp.service.pgd.DmPpxxbService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import org.springframework.stereotype.Service; /** @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2023-12-14 */ @Service -public class DmPpxxbServiceImpl extends ServiceImpl implements DmPpxxbService { +public class DmPpxxbServiceImpl extends MppServiceImpl implements DmPpxxbService { } diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.xml b/src/main/resources/mappers/pgd/DmPpxxbMapper.xml similarity index 87% rename from src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.xml rename to src/main/resources/mappers/pgd/DmPpxxbMapper.xml index e8db635..9d3a5bd 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.xml +++ b/src/main/resources/mappers/pgd/DmPpxxbMapper.xml @@ -76,12 +76,21 @@ ZXWPH, SL, JLDW, WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, drcs, tpxx, dzxqq, xzxqq, gylx, YLZD3, XWH, YLZD9, GYSBH, YHFLH, YLZD6, TQQXZL, LCM3, YLZD5, BZ, DEZL, LCM2, YXZZRQ, YLZD2, LCM5, YLZD8, XNJBS, DRRQ, LCM4, FXWPH, WPCC, FWPJB, JZL, XLCC, YLZD7, SJBCSL, YLZD4, GYLB, DRRY, WPH, YXQSRQ - select - + wlqd.* from - dm_qfxq xq left join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd - WHERE xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD ={dcFd} + dm_qfxq xq join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd + join dm_wlqd wlqd on lj.czbh=wlqd.dc_ch and lj.ljbh=wlqd.wph + WHERE xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd} + + +