From ba2585f2775d30db7da068794b60543ffc83108e Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Wed, 30 Apr 2025 15:02:08 +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=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jhgk/RjhgzController.java | 58 +++++++++---------- .../resources/mappers/jhgk/DmYdjhMapper.xml | 44 +++++++------- 2 files changed, 50 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java index 833955a..7e6001e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java @@ -56,7 +56,7 @@ public class RjhgzController { /** * - * @param yf yyyy/MM + * @param yf yyyy/MM/dd * @return */ @PostMapping("getRjhList") @@ -66,20 +66,22 @@ public class RjhgzController { DateTime lastMonth=DateUtil.offsetMonth(date,-1); //本月天数 Double days=Double.parseDouble(date.toString("dd")); - //上月天数 + //上月工作天数 Double lastMonthDays=Double.parseDouble(DateUtil.endOfMonth(lastMonth).toString("dd")); - int xxr_lastMonth=gcrlService.count(new QueryWrapper() - .eq("substring(gl,0,8)",DateUtil.endOfMonth(lastMonth).toString("yyyy/MM")) - .eq("xxr","0")); + Double xxr_lastMonth=0.0; + List dateTimes_lastMonth=DateUtil.rangeToList(DateUtil.beginOfMonth(lastMonth) + , DateUtil.endOfMonth(lastMonth) + , DateField.DAY_OF_YEAR); + for (DateTime dateTime : dateTimes_lastMonth) { + RjhDto dtos=dmYdjhMapper.getRjh(dateTime.toString("yyyy/MM/dd")); + xxr_lastMonth=ObjectUtil.isEmpty(dtos)?(xxr_lastMonth+1):xxr_lastMonth; + } //本月日期list List dateTimes=DateUtil.rangeToList(DateUtil.beginOfMonth(date) , DateUtil.endOfMonth(date) - , DateField.DAY_OF_YEAR); - //工厂日历,取休息日 - List dateList=gcrlService.list(new QueryWrapper() - .eq("substring(gl,0,8)",date.toString("yyyy/MM")) - .le("gl",date.toString("yyyy/MM/dd")) - .eq("xxr","0")); + , DateField.DAY_OF_YEAR); + //休息日 + Double xxr=0.0; //字段灵活 map<> list 跨位 计算列1 计算列2 计算列3 1日 2日 3日 String[] gw={"抛丸", "数控1", "龙门1", "数控2", "龙门2", "数控3", "龙门3", "数控4", "七跨型材"}; @@ -89,20 +91,14 @@ public class RjhgzController { map.put("gw",s); list.add(map); } + for (DateTime dateTime : dateTimes) { if (!dateTime.isAfter(date)){ RjhDto dtos=dmYdjhMapper.getRjh(dateTime.toString("yyyy/MM/dd")); + xxr=ObjectUtil.isEmpty(dtos)?(xxr+1):xxr; list.forEach(l->{ if (ObjectUtil.isEmpty(dtos)){ - for (EmGcrl emGcrl : dateList) { - if (dateTime.toString("yyyy/MM/dd").equals(emGcrl.getGl())){ l.put("field_"+dateTime.toString("dd"),"休息"); - break; - }else { - l.put("field_"+dateTime.toString("dd"),0); - } - } - }else { if (l.get("gw").equals("抛丸")){ l.put("field_"+dateTime.toString("dd"), ObjectUtil.isEmpty(dtos.getPwnum())?0:dtos.getPwnum()); @@ -138,64 +134,65 @@ public class RjhgzController { //上月日均完成 RjhDto syRwc= dmYdjhMapper.getSyRwc(lastMonth.toString("yyyy/MM"),lastMonthDays-xxr_lastMonth); //本月日均计划 - RjhDto byRjh= dmYdjhMapper.getByRjh(date.toString("yyyy/MM"),days-dateList.size()); + RjhDto byRjh= dmYdjhMapper.getByRjh(date.toString("yyyy/MM"),days-xxr); //本月日均完成 - RjhDto byRwc= dmYdjhMapper.getSyRwc(date.toString("yyyy/MM"),days-dateList.size()); + RjhDto byRwc= dmYdjhMapper.getSyRwc(date.toString("yyyy/MM"),days-xxr); + Double xxr1=xxr; list.forEach(l->{ if (l.get("gw").equals("抛丸")){ l.put("rjwc_sy",syRwc.getPwnum()); l.put("rjjh_by",byRjh.getPwnum()); l.put("rjwc_by",byRwc.getPwnum()); - l.put("ljqg",add(byRwc.getPwnum(),byRjh.getPwnum(),days-dateList.size())); + l.put("ljqg",add(byRwc.getPwnum(),byRjh.getPwnum(),days-xxr1)); } if (l.get("gw").equals("数控1")){ l.put("rjwc_sy",syRwc.getSk1num()); l.put("rjjh_by",byRjh.getSk1num()); l.put("rjwc_by",byRwc.getSk1num()); - l.put("ljqg",add(byRwc.getSk1num(),byRjh.getSk1num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getSk1num(),byRjh.getSk1num(),days-xxr1)); } if (l.get("gw").equals("龙门1")){ l.put("rjwc_sy",syRwc.getLm1num()); l.put("rjjh_by",byRjh.getLm1num()); l.put("rjwc_by",byRwc.getLm1num()); - l.put("ljqg",add(byRwc.getLm1num(),byRjh.getLm1num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getLm1num(),byRjh.getLm1num(),days-xxr1)); } if (l.get("gw").equals("数控2")){ l.put("rjwc_sy",syRwc.getSk2num()); l.put("rjjh_by",byRjh.getSk2num()); l.put("rjwc_by",byRwc.getSk2num()); - l.put("ljqg",add(byRwc.getSk2num(),byRjh.getSk2num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getSk2num(),byRjh.getSk2num(),days-xxr1)); } if (l.get("gw").equals("龙门2")){ l.put("rjwc_sy",syRwc.getLm2num()); l.put("rjjh_by",byRjh.getLm2num()); l.put("rjwc_by",byRwc.getLm2num()); - l.put("ljqg",add(byRwc.getLm2num(),byRjh.getLm2num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getLm2num(),byRjh.getLm2num(),days-xxr1)); } if (l.get("gw").equals("数控3")){ l.put("rjwc_sy",syRwc.getSk3num()); l.put("rjjh_by",byRjh.getSk3num()); l.put("rjwc_by",byRwc.getSk3num()); - l.put("ljqg",add(byRwc.getSk3num(),byRjh.getSk3num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getSk3num(),byRjh.getSk3num(),days-xxr1)); } if (l.get("gw").equals("龙门3")){ l.put("rjwc_sy",syRwc.getLm3num()); l.put("rjjh_by",byRjh.getLm3num()); l.put("rjwc_by",byRwc.getLm3num()); - l.put("ljqg",add(byRwc.getLm3num(),byRjh.getLm3num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getLm3num(),byRjh.getLm3num(),days-xxr1)); } if (l.get("gw").equals("数控4")){ l.put("rjwc_sy",syRwc.getSk4num()); l.put("rjjh_by",byRjh.getSk4num()); l.put("rjwc_by",byRwc.getSk4num()); - l.put("ljqg",add(byRwc.getSk4num(),byRjh.getSk4num(),days-dateList.size())); + l.put("ljqg",add(byRwc.getSk4num(),byRjh.getSk4num(),days-xxr1)); } if (l.get("gw").equals("七跨型材")){ l.put("rjwc_sy",syRwc.getXcnum()); l.put("rjjh_by",byRjh.getXcnum()); l.put("rjwc_by",byRwc.getXcnum()); - l.put("ljqg",add(byRwc.getXcnum(),byRjh.getXcnum(),days-dateList.size())); + l.put("ljqg",add(byRwc.getXcnum(),byRjh.getXcnum(),days-xxr1)); } }); return new ResultBean<>(list); @@ -206,4 +203,5 @@ public class RjhgzController { d=new BigDecimal(d).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue(); return d; } + } diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 09f1e7e..24c8294 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1357,147 +1357,147 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} RTRIM(DM_BCLQJBP.DC_CH) AS dc_ch, RTRIM(DM_BCLQJBP.DC_PL) AS dc_pl, RTRIM(DM_BCLQJBP.DC_FD) AS dc_fd, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN 1 ELSE 0 END) as lm1, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN DM_BCLQMXP.sl ELSE 0 END) as lm1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_lm1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_lm1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 龙门1余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 龙门1前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='7' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 龙门1零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN 1 ELSE 0 END) as s1, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN DM_BCLQMXP.sl ELSE 0 END) as s1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_s1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_s1, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数1余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数1前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='8' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数1零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN 1 ELSE 0 END) as sx2, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.sl ELSE 0 END) as sx2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数小2余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数小2前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数小2零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN 1 ELSE 0 END) as szd2, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.sl ELSE 0 END) as szd2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bclqzl_szd2, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数中大2余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数中大2前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='9' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数中大2零件重, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN 1 ELSE 0 END) as xf, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.sl ELSE 0 END) as xf, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xf, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xf, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小腹余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小腹前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小腹零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN 1 ELSE 0 END) as df, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.sl ELSE 0 END) as df, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_df, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_df, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大腹余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大腹前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='11' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大腹零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN 1 ELSE 0 END) as xzhb, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.sl ELSE 0 END) as xzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小组厚板余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小组厚板前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小组厚板零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN 1 ELSE 0 END) as dzhb, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.sl ELSE 0 END) as dzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dzhb, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大组厚板余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大组厚板前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='14' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大组厚板零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN 1 ELSE 0 END) as sx4, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.sl ELSE 0 END) as sx4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数小4余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数小4前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数小4零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN 1 ELSE 0 END) as jz4, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.sl ELSE 0 END) as jz4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_jz4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_jz4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 机肘4余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 机肘4前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='15' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 机肘4零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN 1 ELSE 0 END) as xm, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.sl ELSE 0 END) as xm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小面余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小面前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小面零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN 1 ELSE 0 END) as dm, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.sl ELSE 0 END) as dm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dm, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大面余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大面前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='5' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大面零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as sx3, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.sl ELSE 0 END) as sx3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sx3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sx3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手小3余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手小3前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手小3零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as sj3, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.sl ELSE 0 END) as sj3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sj3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sj3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手机3余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手机3前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '4230' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手机3零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as szd3, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.sl ELSE 0 END) as szd3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_szd3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 手中大3余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 手中大3前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 手中大3零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN 1 ELSE 0 END) as xzgs, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.sl ELSE 0 END) as xzgs, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xz, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xz, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小组型材余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 小组型材前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 小组型材零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN 1 ELSE 0 END) as dzgs, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.sl ELSE 0 END) as dzgs, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_dz, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_dz, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 大组型材余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大组型材前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.delx!='B' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大组型材零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN 1 ELSE 0 END) as szd4, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.sl ELSE 0 END) as szd4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_szd4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_szd4, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数中大4余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数中大4前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='6' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数中大4零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN 1 ELSE 0 END) as sq2x, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.sl ELSE 0 END) as sq2x, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sq2x, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sq2x, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数曲2小余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数曲2小前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数曲2小零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN 1 ELSE 0 END) as sq2d, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.sl ELSE 0 END) as sq2d, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_sq2d, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_sq2d, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 数曲2大余料重量, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 数曲2大前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='10' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 数曲2大零件重量, - SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN 1 ELSE 0 END) as xq3, + SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.sl ELSE 0 END) as xq3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_xq3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_xq3, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1010' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 小曲3余料重量, @@ -1511,7 +1511,7 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='13' THEN DM_BCLQMXP.QPYLD ELSE 0 END) as 大曲3前批余料代, SUM(CASE WHEN DM_BCLQJBP.DC_ZL= '1110' and DM_BCLQJBP.zzcj='13' THEN isnull( DM_BCLQMXP.ljzl,0) ELSE 0 END) as 大曲3零件重量, - SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN 1 ELSE 0 END) as gd, + SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.sl ELSE 0 END) as gd, SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull(DM_BCLQMXP.LQZL,0) ELSE 0 END) as bclqzl_gd, SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN isnull( DM_BCLQMXP.SHZL,0) ELSE 0 END) as bcshzl_gd, SUM(CASE WHEN DM_BCLQJBP.zzcj='17' THEN DM_BCLQMXP.YLZL ELSE 0 END) as 光电余料重量,