xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
xhj 2 weeks ago
parent 50eab7f303 f29e6b98ee
commit 1e48eb23d5
5 changed files with 68 additions and 114 deletions
Show Stats Download Patch File Download Diff File

67
src/main/java/com/dsic/gj_erp/controller/jcsj/YdjhzzController.java
Unescape View File

@ -39,73 +39,6 @@ public class YdjhzzController {
return new ResultBean(list);
}
public static void main(String[] agrs){
String[] a= {"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_xzxc",
"bclqzl_xz",
"bclqzl_dzxc",
"bclqzl_dz",
"bclqzl_fg",
"bclqzl_szd4",
"bclqzl_sq2x",
"bclqzl_sq2d",
"bclqzl_xq3",
"bclqzl_dq3",
"bclqzl_gd",
"bclqzl_xflj",
"bclqzl_dflj",
"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_xzxc",
"bcshzl_xz",
"bcshzl_dzxc",
"bcshzl_dz",
"bcshzl_fg",
"bcshzl_szd4",
"bcshzl_sq2x",
"bcshzl_sq2d",
"bcshzl_xq3",
"bcshzl_dq3",
"bcshzl_gd",
"bcshzl_xflj",
"bcshzl_dflj",
};
for (String s : a) {
// System.out.println(" @TableField(\""+s+"\")\n" +
// " private Double "+s+";");
System.out.println(" <result column=\""+s+"\" property=\""+s+"\"/>");
}
}
}

55
src/main/java/com/dsic/gj_erp/controller/jhgk/RjhgzController.java
Unescape View File

@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@ -60,20 +61,16 @@ public class RjhgzController {
*/
@PostMapping("getRjhList")
public ResultBean<?> getRjhList(@RequestParam String yf){
//当前月份日期 查询月份 默认当前月
//维修时间
//当前日期
DateTime date= new DateTime();
DateTime lastMonth=DateUtil.lastMonth();
int days=Integer.parseInt(date.toString("dd"));
//如果是本月 那就是今天
//如果是其他月 就全月天数
if (StrUtil.isNotEmpty(yf)){
date= DateUtil.parseDate(yf);
lastMonth=DateUtil.offsetMonth(date,-1);
}
DateTime date= DateUtil.parseDate(yf);
DateTime lastMonth=DateUtil.offsetMonth(date,-1);
//本月天数
Double days=Double.parseDouble(date.toString("dd"));
//上月天数
int lastMonthDays=Integer.parseInt(DateUtil.endOfMonth(lastMonth).toString("dd"));
Double lastMonthDays=Double.parseDouble(DateUtil.endOfMonth(lastMonth).toString("dd"));
int xxr_lastMonth=gcrlService.count(new QueryWrapper<EmGcrl>()
.eq("substring(gl,0,8)",DateUtil.endOfMonth(lastMonth).toString("yyyy/MM"))
.eq("xxr","0"));
//本月日期list
List<DateTime> dateTimes=DateUtil.rangeToList(DateUtil.beginOfMonth(date)
, DateUtil.endOfMonth(date)
@ -81,6 +78,7 @@ public class RjhgzController {
//工厂日历,取休息日
List<EmGcrl> dateList=gcrlService.list(new QueryWrapper<EmGcrl>()
.eq("substring(gl,0,8)",date.toString("yyyy/MM"))
.le("gl",date.toString("yyyy/MM/dd"))
.eq("xxr","0"));
//字段灵活 map<> list<map> 跨位 计算列1 计算列2 计算列3 1日 2日 3日
@ -92,11 +90,19 @@ public class RjhgzController {
list.add(map);
}
for (DateTime dateTime : dateTimes) {
if (!dateTime.isAfter(new Date())){
if (!dateTime.isAfter(date)){
RjhDto dtos=dmYdjhMapper.getRjh(dateTime.toString("yyyy/MM/dd"));
list.forEach(l->{
if (ObjectUtil.isEmpty(dtos)){
l.put("field_"+dateTime.toString("dd"),0);
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());
@ -130,59 +136,74 @@ public class RjhgzController {
}
}
//上月日均完成
RjhDto syRwc= dmYdjhMapper.getSyRwc(lastMonth.toString("yyyy/MM"),lastMonthDays);
RjhDto syRwc= dmYdjhMapper.getSyRwc(lastMonth.toString("yyyy/MM"),lastMonthDays-xxr_lastMonth);
//本月日均计划
RjhDto byRjh= dmYdjhMapper.getByRjh(date.toString("yyyy/MM"),days);
RjhDto byRjh= dmYdjhMapper.getByRjh(date.toString("yyyy/MM"),days-dateList.size());
//本月日均完成
RjhDto byRwc= dmYdjhMapper.getSyRwc(date.toString("yyyy/MM"),days);
RjhDto byRwc= dmYdjhMapper.getSyRwc(date.toString("yyyy/MM"),days-dateList.size());
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()));
}
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()));
}
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()));
}
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()));
}
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()));
}
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()));
}
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()));
}
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()));
}
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()));
}
});
return new ResultBean<>(list);
}
public Double add(Double a,Double b,Double c){
Double d=(a-b)*c;
d=new BigDecimal(d).setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
return d;
}
}

4
src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
Unescape View File

@ -89,6 +89,6 @@ public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh);
List<Ydjhzz> getYdjhzz(String ch);
RjhDto getRjh(String date);
RjhDto getSyRwc(String yf,int num);
RjhDto getByRjh(String yf,int num);
RjhDto getSyRwc(String yf,Double num);
RjhDto getByRjh(String yf,Double num);
}

54
src/main/resources/mappers/jhgk/DmYdjhMapper.xml
Unescape View File

@ -1584,45 +1584,45 @@ where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl}
</select>
<select id="getRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' THEN 1 ELSE 0 END) AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='8' THEN 1 ELSE 0 END) AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='7' THEN 1 ELSE 0 END) AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='12' THEN 1 ELSE 0 END) AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END) AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='14' THEN 1 ELSE 0 END) AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='13' THEN 1 ELSE 0 END) AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END) AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='16' THEN 1 ELSE 0 END) AS xcnum
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' and substring(pwfkrq,0,11)=#{date} THEN 1 ELSE 0 END) AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='8' THEN 1 ELSE 0 END) AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='7' THEN 1 ELSE 0 END) AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='12' THEN 1 ELSE 0 END) AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and (kw='9' or kw='10') THEN 1 ELSE 0 END) AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='14' THEN 1 ELSE 0 END) AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='13' THEN 1 ELSE 0 END) AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and (kw='15' or kw='11') THEN 1 ELSE 0 END) AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,11)=#{date} and kw='16' THEN 1 ELSE 0 END) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgfkrq,0,11)=#{date} or substring(pwfkrq,0,11)=#{date} )
</select>
<select id="getSyRwc" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' THEN 1 ELSE 0 END)/#{num} AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='8' THEN 1 ELSE 0 END)/#{num} AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='7' THEN 1 ELSE 0 END)/#{num} AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='12' THEN 1 ELSE 0 END)/#{num} AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num} AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='14' THEN 1 ELSE 0 END)/#{num} AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='13' THEN 1 ELSE 0 END)/#{num} AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num} AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and kw='16' THEN 1 ELSE 0 END)/#{num} AS xcnum
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.pwfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} THEN 1 ELSE 0 END)/#{num}) AS pwnum,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='8' THEN 1 ELSE 0 END)/#{num}) AS sk1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='7' THEN 1 ELSE 0 END)/#{num}) AS lm1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='12' THEN 1 ELSE 0 END)/#{num}) AS sk2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num}) AS lm2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='14' THEN 1 ELSE 0 END)/#{num}) AS sk3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='13' THEN 1 ELSE 0 END)/#{num}) AS lm3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num}) AS sk4num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgfkrq, '') != '' and substring(qgfkrq,0,8)=#{yf} and kw='16' THEN 1 ELSE 0 END)/#{num}) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgfkrq,0,8)=#{yf} or substring(pwfkrq,0,8)=#{yf} )
</select>
<select id="getByRjh" resultType="com.dsic.gj_erp.bean.jhgk.dto.RjhDto">
SELECT
SUM(CASE WHEN ISNULL(dm_ydjh.pwjhrq, '') != '' THEN 1 ELSE 0 END)/#{num} AS pwnum,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='8' THEN 1 ELSE 0 END)/#{num} AS sk1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='7' THEN 1 ELSE 0 END)/#{num} AS lm1num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='12' THEN 1 ELSE 0 END)/#{num} AS sk2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num} AS lm2num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='14' THEN 1 ELSE 0 END)/#{num} AS sk3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='13' THEN 1 ELSE 0 END)/#{num} AS lm3num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num} AS sk4num,
SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and kw='16' THEN 1 ELSE 0 END)/#{num} AS xcnum
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.pwjhrq, '') != '' and substring(pwjhrq,0,11)>#{yf} THEN 1 ELSE 0 END)/#{num}) AS pwnum,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='8' THEN 1 ELSE 0 END)/#{num}) AS sk1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='7' THEN 1 ELSE 0 END)/#{num}) AS lm1num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='12' THEN 1 ELSE 0 END)/#{num}) AS sk2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and (kw='9' or kw='10') THEN 1 ELSE 0 END)/#{num}) AS lm2num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='14' THEN 1 ELSE 0 END)/#{num}) AS sk3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='13' THEN 1 ELSE 0 END)/#{num}) AS lm3num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and (kw='15' or kw='11') THEN 1 ELSE 0 END)/#{num}) AS sk4num,
CONVERT(decimal(10,1),SUM(CASE WHEN ISNULL(dm_ydjh.qgjhrq, '') != '' and substring(qgjhrq,0,8)=#{yf} and kw='16' THEN 1 ELSE 0 END)/#{num}) AS xcnum
from dm_ydjh WHERE
1=1
and (substring(qgjhrq,0,8)=#{yf} or substring(pwjhrq,0,8)=#{yf} )

2
src/main/resources/mappers/kban/KbanMapper.xml
Unescape View File

@ -272,7 +272,7 @@
dc_ch,count(1) total,ROUND(SUM(bclqzl/1000),2) bclqzl,ROUND(sum(bcshzl/1000),2) bcshzl
from dm_ydjh
WHERE
cast(qgfkrq as date) BETWEEN #{from} and #{to}
cast(qgfkrq as date) BETWEEN #{from} and #{to} and zt='62'
<if test="ylbs!=null and ylbs!=''">
and ylbs=#{ylbs}
</if>

Write Preview
Loading…
Cancel
Save