Merge remote-tracking branch 'origin/master'

master
xhj 6 months ago
commit 47d30b6c75

@ -1,9 +1,6 @@
package com.dsic.gj_erp.controller.jhgk; package com.dsic.gj_erp.controller.jhgk;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmXbjh; import com.dsic.gj_erp.bean.jhgk.DmXbjh;
@ -14,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

@ -1,8 +1,16 @@
package com.dsic.gj_erp.controller.kban; package com.dsic.gj_erp.controller.kban;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmBzry; import com.dsic.gj_erp.bean.jcsj.DmBzry;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.exception.ServiceException;
import com.dsic.gj_erp.pc.Constant;
import com.dsic.gj_erp.service.KbanService;
import com.dsic.gj_erp.service.jcsj.DmBzryService; import com.dsic.gj_erp.service.jcsj.DmBzryService;
import com.dsic.gj_erp.service.zyjh.ZyjhService; import com.dsic.gj_erp.service.zyjh.ZyjhService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -10,9 +18,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
@RestController @RestController
@RequestMapping("kban") @RequestMapping("kban")
@ -21,6 +28,94 @@ public class KbanController {
private final ZyjhService zyjhService; private final ZyjhService zyjhService;
private final DmBzryService cqService; private final DmBzryService cqService;
private final KbanService kbanService;
/**
* 线
*/
@GetMapping("xbjh")
public ResultBean<?> kban(String nf){
if (ObjUtil.isEmpty(nf)){
throw new ServiceException(10001,"年份不能为空");
}
List<Double> xbjh=kbanService.getEveryMonXbzlByNf(nf);
List<Map<String, Object>> comp = kbanService.getEveryCompZlByNf(nf);
HashMap<Object, Object> map = new HashMap<>();
map.put("xbjh", xbjh);
map.put("comp", comp);
return new ResultBean<>(map);
}
/**
*
*/
@GetMapping("getJhgz")
public ResultBean<?> getJhgz(){
return new ResultBean<>(kbanService.getJhgz());
}
/**
*
*/
@GetMapping("getZyjhDetailBySbCode")
public ResultBean<?> getZyjhDetailBySbCode(String code){
if (ObjUtil.isEmpty(code)){
throw new ServiceException(10001,"设备编号不能为空");
}
return new ResultBean<>(kbanService.getZyjhDetailBySbCode(code));
}
/**
* 线
*/
@GetMapping("getSb")
public ResultBean<?> getSb(){
List<Map<String, Object>> sb = kbanService.getSb();
return new ResultBean<>(sb);
}
/**
*
*/
@GetMapping("getZjjhByUserCode")
public ResultBean<?> getZjjhByUserCode(String userCode){
if (ObjUtil.isEmpty(userCode)){
throw new ServiceException(10001,"用户不能为空");
}
return new ResultBean<>(kbanService.getZjjhByUserCode(userCode));
}
/**
*
*/
@GetMapping("getKwDetailByKw")
public ResultBean<?> getEveryKw(String kw){
if (ObjUtil.isEmpty(kw)){
throw new ServiceException(10001,"垮位不能为空");
}
QueryWrapper<DmYdjh> wrapper = new QueryWrapper<>();
if ("1".equals(kw)){
wrapper.lambda().ge(DmYdjh::getZt, 11);
}
if (Arrays.asList("2","3","4").contains(kw)){
wrapper.eq("SUBSTRING(tzbh,6,1)", kw);
wrapper.ge("zt", "42");
}
return new ResultBean<>(zyjhService.list(wrapper));
}
/**
*
*/
@GetMapping("getEveryKw")
public ResultBean<?> getEveryKw(){
Map<String, Object> map = kbanService.getEveryKw();
return new ResultBean<>(map);
}
/** /**
* , * ,

@ -0,0 +1,28 @@
package com.dsic.gj_erp.mapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.pc.Constant;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface KbanMapper {
//线表重量
List<Double> getEveryMonXbzlByNf(String nf);
//作业计划完成重量
List<Map<String,Object>> getEveryCompZlByNf(String from, String to);
List<Map<String,String>> getEveryKw(String from, String to);
List<DmYdjh> getZjjhByUserCode(String userCode,String from, String to);
List<Map<String,Object>> getSb(String day);
List<DmYdjh> getZyjhDetailBySbCode(String code);
List<Map<String,Object>> getJhgz(String from, String to);
}

@ -13,6 +13,7 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj; import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj;
import com.dsic.gj_erp.bean.jhgk.DmYdjhxf; import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper; import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
import com.dsic.gj_erp.pc.Constant;
import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.pc.Manager;
import com.dsic.gj_erp.service.jcsj.DmBchxylpService; import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService; import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService;
@ -71,6 +72,12 @@ public class 三月滚动接口 {
if (ObjectUtil.isNotEmpty(dmSygdMxes)){ if (ObjectUtil.isNotEmpty(dmSygdMxes)){
for (DmSygdMx mx:dmSygdMxes){ for (DmSygdMx mx:dmSygdMxes){
mx.(_.get(),_.getDate()); mx.(_.get(),_.getDate());
if (_.get()== Constant..线){
mx.setHxsb(_.get());
}
if (_.get()== Constant..){
mx.setQgsb(_.get());
}
} }
} }
}); });

@ -0,0 +1,117 @@
package com.dsic.gj_erp.service;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.mapper.KbanMapper;
import com.dsic.gj_erp.pc.Constant;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@Service
@AllArgsConstructor
public class KbanService {
private final KbanMapper kbanMapper;
public List<Map<String,Object>> getJhgz(){
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
return kbanMapper.getJhgz(from,to);
}
public List<DmYdjh> getZyjhDetailBySbCode(String code){
return kbanMapper.getZyjhDetailBySbCode(code);
}
public List<Map<String,Object>> getSb(){
DateTime date = DateUtil.date();
return kbanMapper.getSb(date.toString("yyyy/MM/dd"));
}
public List<DmYdjh> getZjjhByUserCode(String userCode){
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
return kbanMapper.getZjjhByUserCode(userCode,from,to);
}
/**
*
* ,,
*/
public Map<String,Object> getEveryKw(){
Map<String, Object> map = new HashMap<>();
DateTime date = DateUtil.date();
String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
String to = DateUtil.endOfMonth(date).toString("yyyy/MM/dd");
List<Map<String, String>> everyKw = kbanMapper.getEveryKw(from, to);
AtomicInteger sl=new AtomicInteger(0);
AtomicInteger slc=new AtomicInteger(0);
AtomicInteger kw2=new AtomicInteger(0);
AtomicInteger kw2c=new AtomicInteger(0);
AtomicInteger kw3=new AtomicInteger(0);
AtomicInteger kw3c=new AtomicInteger(0);
AtomicInteger kw4=new AtomicInteger(0);
AtomicInteger kw4c=new AtomicInteger(0);
everyKw.forEach(item->{
int kw = Integer.parseInt(item.get("kw"));
int zt = Integer.parseInt(item.get("zt"));
if (zt>=11){
sl.incrementAndGet();
}
if (zt>=42){
slc.incrementAndGet();
}
if (kw==2){
if (zt>=42){
kw2.incrementAndGet();
}
if (zt==52||zt==62){
kw2c.incrementAndGet();
}
}
if (kw==3){
if (zt>=42){
kw3.incrementAndGet();
}
if (zt==52||zt==62){
kw3c.incrementAndGet();
}
}
if (kw==4){
if (zt>=42){
kw4.incrementAndGet();
}
if (zt==52||zt==62){
kw4c.incrementAndGet();
}
}
});
List<Integer> zsl = Arrays.asList(sl.get(),kw2.get(),kw3.get(),kw4.get());
List<Integer> kwc = Arrays.asList(slc.get(),kw2c.get(),kw3c.get(),kw4c.get());
List<Integer> wcl = Arrays.asList(sl.get()-slc.get(),kw2.get()-kw2c.get(),kw3.get()-kw3c.get(),kw4.get()-kw4c.get());
map.put("zsl",zsl);//总数量
map.put("kwc",kwc);//完成数量
map.put("wcl",wcl);//未处理
return map;
}
public List<Double> getEveryMonXbzlByNf(String nf) {
return kbanMapper.getEveryMonXbzlByNf(nf);
}
public List<Map<String,Object>> getEveryCompZlByNf(String nf) {
DateTime from = DateUtil.beginOfYear(DateUtil.parse(nf, "yyyy"));
DateTime to = DateUtil.endOfYear(DateUtil.parse(nf, "yyyy"));
return kbanMapper.getEveryCompZlByNf(from.toString("yyyy/MM/dd"), to.toString("yyyy/MM/dd"));
}
}

@ -29,7 +29,6 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
private final DmCbxxpService dmCbxxpService; private final DmCbxxpService dmCbxxpService;
private final RedisTemplate<String,Object> redisTemplate; private final RedisTemplate<String,Object> redisTemplate;
public List<Map<String, Object>> gcjd(){ public List<Map<String, Object>> gcjd(){
ImmutableMap<String, Boolean> map = ImmutableMap.of("flag", true); ImmutableMap<String, Boolean> map = ImmutableMap.of("flag", true);
List<DmCbxxp> list = dmCbxxpService.getList(map); List<DmCbxxp> list = dmCbxxpService.getList(map);

@ -94,7 +94,7 @@
DISTINCT zt, sum(isnull(bcshzl,0)/1000) over(PARTITION by zt) as t DISTINCT zt, sum(isnull(bcshzl,0)/1000) over(PARTITION by zt) as t
from from
dm_ydjh dm_ydjh
WHERE jssj BETWEEN #{from} and #{to} WHERE jssj BETWEEN #{from} and #{to} and zt>='2'
</select> </select>
<select id="gekuachaliang" resultType="java.util.Map"> <select id="gekuachaliang" resultType="java.util.Map">

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.KbanMapper">
<select id="getEveryMonXbzlByNf" resultType="double">
select sum(zl) from dm_xbjh where nf=#{nf} group by yf
</select>
<select id="getEveryCompZlByNf" resultType="map">
SELECT MONTH(CAST(qgfkrq AS DATE)) mon,sum(bcshzl) zl from dm_ydjh WHERE qgfkrq BETWEEN #{from} and #{to} group by MONTH(CAST(qgfkrq AS DATE))
</select>
<select id="getEveryKw" resultType="java.util.Map">
SELECT
zt,SUBSTRING(tzbh,6,1) kw
from dm_ydjh WHERE zt>=11 and jssj BETWEEN #{from} and #{to}
</select>
<select id="getZjjhByUserCode" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
SELECT
*
from
dm_ydjh
WHERE
(slfkry =#{userCode} or pwfkry =#{userCode} or llfkry =#{userCode} or qgfkry =#{userCode} or hxfkry =#{userCode})
and jssj between #{from} and #{to}
</select>
<select id="getSb" resultType="java.util.Map">
SELECT
hxsb ,qgsb,
case when zt>=42 then sum(1) end p,
case when zt>=52 then sum(1) end hx,
case when zt>=62 then sum(1) end qg
from dm_ydjh WHERE zt>=42 and (hxfkrq=#{day} or qgfkrq=#{day}) group by hxsb ,qgsb,zt
</select>
<select id="getZyjhDetailBySbCode" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
select
*
from
dm_ydjh
<where>
zt>=42 and (hxsb=#{code} or qgsb=#{code})
</where>
</select>
<select id="getJhgz" resultType="java.util.Map">
SELECT
DISTINCT dc_ch ,dc_pl ,min(sljhrq) b ,sum(1) sl,case when isnull(qgfkrq,'')!='' then sum(1) end wcsl,
case when isnull(qgfkrq ,'')!='' then max(qgfkrq) else CONVERT(varchar,dateadd(day,14,min(sljhrq)),111) end e
from
dm_ydjh
WHERE
jssj BETWEEN #{from} and #{to}
group by
dc_ch ,dc_pl ,qgfkrq
order by dc_ch ,dc_pl
</select>
</mapper>
Loading…
Cancel
Save