From a244b131f0aa6c0a3d9ec3fa3c8918d8ccf58b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 4 Nov 2024 16:59:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E5=92=8C=E6=9F=A5=E8=AF=A2=E8=A1=A8=E6=A0=BC=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BF=AE=E6=AD=A3=202.?= =?UTF-8?q?=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E5=92=8C=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A2=9E=E5=8A=A0=E4=BD=99=E6=96=99=E6=A0=87?= =?UTF-8?q?=E8=AF=86=203.=E4=BF=AE=E5=A4=8D=E7=9C=8B=E6=9D=BF=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E6=8E=A5=E5=8F=A3=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=BC=BA=E5=A4=B1=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9F=A5=E8=AF=A2=E6=80=BB=E4=BA=BA=E6=95=B0=E4=B8=8E?= =?UTF-8?q?=E7=8F=AD=E6=AC=A1=E5=90=88=E8=AE=A1=E4=BA=BA=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E7=AC=A6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 2 ++ .../com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java | 4 ++++ .../java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 2 ++ .../gj_erp/controller/kban/KbanController.java | 2 +- .../gj_erp/pc/service/三月滚动接口.java | 4 ++++ .../resources/mappers/jhgk/DmSygdxqMapper.xml | 15 ++++++++++----- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java index 3d6fb22..a79b3be 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java @@ -180,6 +180,8 @@ public class DmSygdMx implements Serializable { @ApiModelProperty(value = "前批余料代") private Double bcqpyld; + private String ylbs;//余料标识 + private String parentId; private String ylbhgg; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java index 3bb5785..b4dd290 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java @@ -1,6 +1,7 @@ package com.dsic.gj_erp.bean.jhgk; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -190,6 +191,9 @@ public class DmSygdMxLj implements Serializable { private String ylbhgg; + @TableField(exist = false) + private String ylbs; //余料标识 + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; 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 d3ac185..5fef265 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 @@ -232,6 +232,8 @@ public class DmYdjh implements Serializable { @ApiModelProperty(value = "前批余料代") private Double bcqpyld; + private String ylbs;//余料标识 + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java index 3db0bcb..90addc6 100644 --- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java +++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java @@ -69,7 +69,7 @@ public class KbanController { @GetMapping("kq") public ResultBean kq(){ List ryList=cqService.list(Wrappers.lambdaQuery() - .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt)); + .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt).ne(DmBzry::getZt,"")); Map map=new HashMap<>(); map.put("total",ryList.size()); diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index 7b152a9..022fc72 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java @@ -5,13 +5,16 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmBchxylp; import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj; import com.dsic.gj_erp.bean.jhgk.DmYdjhxf; import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper; import com.dsic.gj_erp.pc.Manager; +import com.dsic.gj_erp.service.jcsj.DmBchxylpService; import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdService; @@ -32,6 +35,7 @@ public class 三月滚动接口 { private final DmSygdMxLjService ljService; private final DmSygdMxService sygdMxService; private final DmSygdService sygdService; + private final DmBchxylpService bchxylpService; @Transactional public ResultBean 生成三月滚动(String begin, String end) { diff --git a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml b/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml index 52af712..d8f3968 100644 --- a/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml +++ b/src/main/resources/mappers/jhgk/DmSygdxqMapper.xml @@ -153,12 +153,17 @@ dm_bom.bcljtlzl, dm_bom.ylbhgg, dm_bom.bcqpyld, + bc.sfyl ylbs, REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') as id - - from dm_sygdxq LEFT JOIN dm_bom - on dm_bom.dcch = dm_sygdxq.DC_CH - and dm_bom.pl = dm_sygdxq.DC_PL - and dm_bom.fd = dm_sygdxq.DC_FD + from + dm_sygdxq LEFT JOIN dm_bom on dm_bom.dcch = dm_sygdxq.DC_CH and dm_bom.pl = dm_sygdxq.DC_PL and dm_bom.fd = dm_sygdxq.DC_FD + left join + (select + dc_ch,dc_pl,tzbh,sfyl,rn + from + (select dc_ch,dc_pl,tzbh,sfyl, + ROW_NUMBER() over(PARTITION by dc_ch ,dc_pl,tzbh order by tzbh) rn from dm_bchxylp) a where a.rn=1) bc + on dm_bom.dcch =bc.dc_ch and dm_bom.pl =bc.dc_pl and dm_bom.tzbh =bc.tzbh where dm_sygdxq.xzglxq between #{begin} and #{end} and dm_bom.type = 'b' ORDER BY dm_sygdxq.xzglxq,dm_sygdxq.DC_CH,dm_sygdxq.DC_PL,dm_bom.TZBH,dm_sygdxq.DC_FD