1.预切板

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);
     }
 

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<String> dcPlList=null;
+        List<String> dcPlList = mapper.getAllDcPlByDcCh(ch,dcpl,dcpl1);
-        if (StrUtil.isAllEmpty(dcpl,dcpl1)){
-            dcPlList = mapper.getAllDcPlByDcCh(ch,dcpl,dcpl1);
-        }
 
         if (dcPlList!=null){
             bclqmxpService.dbs(ch,dcPlList);

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java

@@ -52,9 +52,8 @@ public class DmBclqmxpServiceImpl extends ServiceImpl<DmBclqmxpMapper, DmBclqmxp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dbs(String dcCh,List<String> plList) {
-        List<DmBclqmxp> 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<File> fileList = FileUtil.loopFiles(fileDir);
@@ -65,9 +64,12 @@ public class DmBclqmxpServiceImpl extends ServiceImpl<DmBclqmxpMapper, DmBclqmxp
                         for (String _str:strings){
                             if (_str.contains("*")){
                                 String[] split = _str.split(" ");
+                                if (split.length<15){
+                                    continue;
+                                }
                                 if ("*".equals(split[13])){
                                     try {
-                                        String tzbh=split[15];
+                                        String tzbh=split[14];
                                         String wpgg=split[0];
                                         this.lambdaUpdate().set(DmBclqmxp::getBz,tzbh)
                                                 .eq(DmBclqmxp::getDcChZ,dcCh)

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
-import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository;
 import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
 import com.dsic.gj_erp.service.jcsj.EmGcrlService;
 import org.apache.commons.lang3.StringUtils;
@@ -33,8 +32,6 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
 
     @Resource
     EmGcrlMapper emGcrlMapper;
-    @Resource
-    EmGcrlRepository emGcrlRepository;
 
 
     String[] weekArray = { "星期一", "星期二", "星期三", "星期四", "星期五", "星期六","星期日"};

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,'')!=''
             <if test="sllsh!=null and sllsh!=''">
                 and a.sllsh=#{sllsh}
             </if>
@@ -1346,6 +1346,18 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
         <result column="bcshzl_gd" property="bcshzl_gd"/>
         <result column="bcshzl_xflj" property="bcshzl_xflj"/>
         <result column="bcshzl_dflj" property="bcshzl_dflj"/>
+        <result column="xj2" property="xj2"/>
+        <result column="bclqzl_xj2" property="bclqzl_xj2"/>
+        <result column="bcshzl_xj2" property="bcshzl_xj2"/>
+        <result column="小激光2余料重量" property="小激光2余料重量"/>
+        <result column="小激光2前批余料代" property="小激光2前批余料代"/>
+        <result column="小激光2零件重量" property="小激光2零件重量"/>
+        <result column="dj2" property="dj2"/>
+        <result column="bclqzl_dj2" property="bclqzl_dj2"/>
+        <result column="bcshzl_dj2" property="bcshzl_dj2"/>
+        <result column="大激光2余料重量" property="大激光2余料重量"/>
+        <result column="大激光2前批余料代" property="大激光2前批余料代"/>
+        <result column="大激光2零件重量" property="大激光2零件重量"/>
     </resultMap>
 
     <select id="getYdjhzz" resultMap="ZZResultMap">
@@ -1952,6 +1964,20 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
         CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 大曲3前批余料代,
         CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 大曲3零件重量,
 
+        SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.sl ELSE 0 END) as xj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='12' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_xj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='12' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_xj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 小激光2余料重量,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 小激光2前批余料代,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1010' and DM_BCLQJBP.zzcj='12' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 小激光2零件重量,
+
+        SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.sl ELSE 0 END) as dj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='12' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_dj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='12' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bcshzl_dj2,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.YLZL ELSE 0 END)/1000 as decimal(18,1)) as 大激光2余料重量,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='12' THEN DM_BCLQMXP.QPYLD ELSE 0 END)/1000 as decimal(18,1)) as 大激光2前批余料代,
+        CAST(SUM(CASE WHEN DM_BCLQJBP.DC_ZL=  '1110' and DM_BCLQJBP.zzcj='12' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END)/1000 as decimal(18,1)) as 大激光2零件重量,
+
         SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.sl ELSE 0 END) as gd,
         CAST(SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END)/1000 as decimal(18,1)) as bclqzl_gd,
         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,
@@ -2059,8 +2085,11 @@ where dm_ydjh.DC_CH=#{dcch}  and dm_ydjh.dc_pl=#{dcpl}
         <if test="dcpl!=null and dcpl!='' and dcpl1!=null and dcpl1!=''">
             and dc_pl between #{dcpl} and #{dcpl1}
         </if>
+        <if test="dcpl!=null and dcpl!='' and (dcpl1==null or dcpl1=='')">
+            and dc_pl=#{dcpl}
+        </if>
         <if test="(dcpl==null or dcpl=='') and dcpl1!=null and dcpl1!=''">
-            and dc_pl &lt;=#{dcpl1}
+            and dc_pl&lt;=#{dcpl1}
         </if>
     </select>
 </mapper>