From 475d982dabdcf4f0ca6ed193f389b6b667168fe5 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, 9 Mar 2026 15:20:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E5=88=87=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/jcsj/Ydjhzz.java | 31 ++++++++++++++--- .../controller/jcsj/YdjhzzController.java | 8 ++--- .../jcsj/impl/DmBclqmxpServiceImpl.java | 8 +++-- .../service/jcsj/impl/EmGcrlServiceImpl.java | 3 -- .../resources/mappers/jhgk/DmYdjhMapper.xml | 33 +++++++++++++++++-- 5 files changed, 64 insertions(+), 19 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 cef020a..a186d57 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 @@ -341,6 +341,22 @@ public class Ydjhzz implements Serializable { private Double 方钢领取米数; private Double 方钢实耗米数; + //激光 + private Double xj2; + private Double bclqzl_xj2; + private Double bcshzl_xj2; + private Double 小激光2余料重量; + private Double 小激光2前批余料代; + private Double 小激光2零件重量; + + + private Double dj2; + private Double bclqzl_dj2; + private Double bcshzl_dj2; + private Double 大激光2余料重量; + private Double 大激光2前批余料代; + private Double 大激光2零件重量; + private Double xcgs_hj; private Double xcms_hj; public Double getXchdw(){ @@ -356,11 +372,14 @@ public class Ydjhzz implements Serializable { return add(d); } public Double getHjbs(){ - Double[] d= {lm1,s1,sx2,szd2,xf,df,xzhb,dzhb,sx4,jz4,xm,dm,sx3,sj3,szd3,szd4,sq2d,sq2x,xq3,dq3,gd}; + Double[] d= {lm1,s1,sx2,szd2,xf,df,xzhb,dzhb,sx4,jz4,xm,dm,sx3,sj3,szd3,szd4,sq2d,sq2x,xq3,dq3,gd,xj2,dj2}; return add(d); } public Double getLqhj_xz(){ - Double[] arr= {lqzl_fg,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}; + Double[] arr= {lqzl_fg,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, + bclqzl_xj2 + }; return add(arr); } public Double getXcgs_hj(){ @@ -372,15 +391,17 @@ public class Ydjhzz implements Serializable { return add(arr); } public Double getShhj_xz(){ - Double[] arr= {shzl_fg,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}; + Double[] arr= {shzl_fg,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,bcshzl_xj2 + }; return add(arr); } public Double getLqhj_dz(){ - Double[] arr={bclqzl_szd4,bclqzl_sq2x,bclqzl_sq2d,bclqzl_xq3,bclqzl_dq3,bclqzl_gd}; + Double[] arr={bclqzl_szd4,bclqzl_sq2x,bclqzl_sq2d,bclqzl_xq3,bclqzl_dq3,bclqzl_gd,bclqzl_dj2}; return add(arr); } public Double getShhj_dz(){ - Double[] arr= {bcshzl_szd4,bcshzl_sq2x,bcshzl_sq2d,bcshzl_xq3,bcshzl_dq3,bcshzl_gd}; + Double[] arr= {bcshzl_szd4,bcshzl_sq2x,bcshzl_sq2d,bcshzl_xq3,bcshzl_dq3,bcshzl_gd,bcshzl_dj2}; return add(arr); } diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java index 85b1ae8..9ce847f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java @@ -1,6 +1,7 @@ package com.dsic.gj_erp.controller.jcsj; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; @@ -40,8 +41,6 @@ public class YdjhzzController { private final DmYdjhMapper mapper; private final DmBclqmxpService bclqmxpService; - - @ApiOperation(value = "查询") @PostMapping(value = "/getList") public ResultBean getList(@RequestParam String ch,String dcpl,String dcpl1) { @@ -60,10 +59,7 @@ public class YdjhzzController { @PostMapping(value = "/dbs") public ResultBean dbs(@RequestParam String ch,String dcpl,String dcpl1) { - List dcPlList=null; - if (StrUtil.isAllEmpty(dcpl,dcpl1)){ - dcPlList = mapper.getAllDcPlByDcCh(ch,dcpl,dcpl1); - } + List dcPlList = mapper.getAllDcPlByDcCh(ch,dcpl,dcpl1); if (dcPlList!=null){ bclqmxpService.dbs(ch,dcPlList); diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java index 89d291e..a612847 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java @@ -52,9 +52,8 @@ public class DmBclqmxpServiceImpl extends ServiceImpl plList) { - List list=new ArrayList<>(); plList.forEach(pl->{ - String dirStr="static/"+dcCh+"/"+pl+"/其他"; + String dirStr="static/upload/"+dcCh+"/"+pl+"/其他"; File fileDir = new File(dirStr); String patternStr = pl + "批量钢材领取表"; List fileList = FileUtil.loopFiles(fileDir); @@ -65,9 +64,12 @@ public class DmBclqmxpServiceImpl extends ServiceImpl impleme @Resource EmGcrlMapper emGcrlMapper; - @Resource - EmGcrlRepository emGcrlRepository; String[] weekArray = { "星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"}; diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 0d6f54e..d3f394c 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1242,7 +1242,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} from dm_ydjh a left join dm_tlt_print_wh b on a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.tzbh=b.dc_tlt where - zt=#{zt} + zt=#{zt} and isnull(a.dc_ch,'')!='' and isnull(a.dc_pl,'')!='' and isnull(a.tzbh,'')!='' and a.sllsh=#{sllsh} @@ -1346,6 +1346,18 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} + + + + + + + + + + + +