From f5c504ade14d7746e93774404cf3e458dca2629c Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Wed, 14 May 2025 12:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E8=BF=BD?= =?UTF-8?q?=E8=B8=AA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9E=8B=E6=9D=90=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jcsj/Ydjhzz.java | 55 ++++++++++++------- .../resources/mappers/jhgk/DmYdjhMapper.xml | 45 +++++++++++---- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java index 6e1c0dd..db0ed08 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/Ydjhzz.java @@ -101,19 +101,19 @@ public class Ydjhzz implements Serializable { @ApiModelProperty(value = "手中大3吨位") private Double szd3dw; @ApiModelProperty(value = "小组型材") - private Double xzxc; + private Double xzxcgs; @ApiModelProperty(value = "小组型材吨位") private Double xzdw; @ApiModelProperty(value = "小组根数") private Double xzgs; @ApiModelProperty(value = "大组型材") - private Double dzxc; + private Double dzxcgs; @ApiModelProperty(value = "大组吨位") private Double dzdw; @ApiModelProperty(value = "大组根数") private Double dzgs; @ApiModelProperty(value = "方钢") - private Double fg; + private Double fggs; @ApiModelProperty(value = "方钢吨位") private Double fgdw; @ApiModelProperty(value = "数中大4") @@ -188,11 +188,6 @@ public class Ydjhzz implements Serializable { private Double bclqzl_sj3; private Double bclqzl_szd3; - - private Double bclqzl_xz; - - private Double bclqzl_dz; - private Double bclqzl_szd4; private Double bclqzl_sq2x; @@ -239,15 +234,13 @@ public class Ydjhzz implements Serializable { private Double bcshzl_szd3; - private Double bcshzl_xzxc; + private Double shzl_xzxc; - private Double bcshzl_xz; - private Double bcshzl_dzxc; + private Double shzl_dzxc; - private Double bcshzl_dz; - private Double bcshzl_fg; + private Double shzl_fg; private Double bcshzl_szd4; @@ -264,10 +257,8 @@ public class Ydjhzz implements Serializable { private Double bcshzl_xflj; private Double bcshzl_dflj; - private Double lqhj_xz; - private Double lqhj_dz; - private Double shhj_xz; - private Double shhj_dz; + + private Double 龙门1余料重量; private Double 龙门1前批余料代; private Double 龙门1零件重量; @@ -337,7 +328,21 @@ public class Ydjhzz implements Serializable { private Double 光电余料重量; private Double 光电前批余料代; private Double 光电零件重量; - + private Double lqzl_xzxc; + private Double lqzl_dzxc; + private Double lqzl_fg; + private Double 大组型材领取米数; + private Double 大组型材实耗米数; + private Double 小组型材领取米数; + private Double 小组型材实耗米数; + private Double 方钢余料重量; + private Double 方钢前批余料代; + private Double 方钢零件重量; + private Double 方钢领取米数; + private Double 方钢实耗米数; + + private Double xcgs_hj; + private Double xcms_hj; public Double getXchdw(){ Double[] d= {xzdw,dzdw,fgdw}; return add(d); @@ -355,11 +360,19 @@ public class Ydjhzz implements Serializable { return add(d); } public Double getLqhj_xz(){ - Double[] arr= {bclqzl_lm1,bclqzl_s1,bclqzl_sx2,bclqzl_szd2,bclqzl_xf,bclqzl_df,bclqzl_xzhb,bclqzl_dzhb,bclqzl_sx4,bclqzl_jz4,bclqzl_xm,bclqzl_dm,bclqzl_sx3,bclqzl_sj3,bclqzl_szd3,bclqzl_xz,bclqzl_dz}; + Double[] arr= {bclqzl_lm1,bclqzl_s1,bclqzl_sx2,bclqzl_szd2,bclqzl_xf,bclqzl_df,bclqzl_xzhb,bclqzl_dzhb,bclqzl_sx4,bclqzl_jz4,bclqzl_xm,bclqzl_dm,bclqzl_sx3,bclqzl_sj3,bclqzl_szd3,lqzl_xzxc,lqzl_dzxc}; + return add(arr); + } + public Double getXcgs_hj(){ + Double[] arr= {dzxcgs,xzxcgs,fggs}; + return add(arr); + } + public Double getXcms_hj(){ + Double[] arr= {大组型材领取米数,小组型材领取米数}; return add(arr); } - public Double getShhj_xz(){ - Double[] arr= {bcshzl_lm1,bcshzl_s1,bcshzl_sx2,bcshzl_szd2,bcshzl_xf,bcshzl_df,bcshzl_xzhb,bcshzl_dzhb,bcshzl_sx4,bcshzl_jz4,bcshzl_xm,bcshzl_dm,bcshzl_sx3,bcshzl_sj3,bcshzl_szd3,bcshzl_xz,bcshzl_dz}; + public Double getShhj_xz(){ + Double[] arr= {bcshzl_lm1,bcshzl_s1,bcshzl_sx2,bcshzl_szd2,bcshzl_xf,bcshzl_df,bcshzl_xzhb,bcshzl_dzhb,bcshzl_sx4,bcshzl_jz4,bcshzl_xm,bcshzl_dm,bcshzl_sx3,bcshzl_sj3,bcshzl_szd3,shzl_xzxc,shzl_dzxc}; return add(arr); } public Double getLqhj_dz(){ diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 949351f..fdcfce3 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1308,11 +1308,6 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} - - - - - @@ -1336,11 +1331,12 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} - - - - - + + + + + + @@ -1516,7 +1512,34 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_gd, CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 光电余料重量, CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 光电前批余料代, - CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 光电零件重量 + CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 光电零件重量, + + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.sl ELSE 0 END) as dzxcgs, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.lqms ELSE 0 END) as 大组型材领取米数, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.shms ELSE 0 END) as 大组型材实耗米数, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as lqzl_dzxc, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as shzl_dzxc, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 大组型材余料重量, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 大组型材前批余料代, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 大组型材零件重量, + + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.sl ELSE 0 END) as xzxcgs, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.lqms ELSE 0 END) as 小组型材领取米数, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.shms ELSE 0 END) as 小组型材实耗米数, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as lqzl_xzxc, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as shzl_xzxc, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 小组型材余料重量, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 小组型材前批余料代, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQMXP.WPMC in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 小组型材零件重量, + + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN DM_BCLQMXP.sl ELSE 0 END) as fggs, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN DM_BCLQMXP.lqms ELSE 0 END) as 方钢领取米数, + SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN DM_BCLQMXP.shms ELSE 0 END) as 方钢实耗米数, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as lqzl_fg, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as shzl_fg, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 方钢余料重量, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 方钢前批余料代, + CAST(SUM(CASE WHEN DM_BCLQMXP.DELX_z='X' and DM_BCLQMXP.WPMC not in ('球扁钢','角钢') THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 方钢零件重量 FROM DM_BCLQJBP,DM_BCLQMXP left join DM_WPJBP on DM_BCLQMXP.WPH = DM_WPJBP.WPH WHERE DM_BCLQMXP.LQBH = DM_BCLQJBP.LQBH and DM_BCLQJBP.DC_CH=#{ch}