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

修改

Browse Source
master
xiaoning 2 weeks ago
parent 0ebcadcedc
commit 61b7bcf1a7
2 changed files with 23 additions and 70 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+"\"/>");
}
}
}

26
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;
@ -67,6 +68,9 @@ public class RjhgzController {
Double days=Double.parseDouble(date.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)
@ -74,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日
@ -131,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;
}
}

Write Preview
Loading…
Cancel
Save