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

修改三月滚动计划管理查询

Browse Source
master
xiaoning 11 months ago
parent 6e8779ca03
commit 79a4be237e
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java
Unescape View File

@ -80,7 +80,7 @@ public class DmYdjhxf implements Serializable {
private String qkxcms;
@ApiModelProperty(value = "型材面板")
private String xcmb;
@ApiModelProperty(value = "分段需求")
@ApiModelProperty(value = "分段需求/小组配送结束")
private String fdxq;
@ApiModelProperty(value = "光电结束")
private String gdjs;

35
src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
Unescape View File

@ -9,16 +9,14 @@ import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.EmGcrl;
import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.bean.jhgk.DmDhqdp;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.jhgk.DmSygd;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.*;
import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
import com.dsic.gj_erp.bean.jhgk.excel.SyExcel;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelQFListener;
import com.dsic.gj_erp.listeners.ExcelSYListener;
import com.dsic.gj_erp.service.jcsj.EmGcrlService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.sy.SYService;
import io.swagger.annotations.ApiOperation;
@ -47,25 +45,28 @@ public class DmSygdController {
@Resource
DmSygdService service;
@Resource
DmSygdMxService mxService;
@Autowired
private EmGcrlService gcrlService;
@RequestMapping("/getList")
@AuthFunction
public ResultBean getList(@RequestBody DmSygd sygd){
List<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
.eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt())
.ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime())
.le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime())
.orderByAsc("sl_sj,dc_ch,dc_pl")
);
// List<DmSygd> list= service.list(new QueryWrapper<DmSygd>()
// .eq(StrUtil.isNotEmpty(sygd.getGdZt()),"gd_zt",sygd.getGdZt())
// .ge(StrUtil.isNotEmpty(sygd.getBeginTime()),"gjjs_xz",sygd.getBeginTime())
// .le(StrUtil.isNotEmpty(sygd.getEndTime()),"gjjs_xz",sygd.getEndTime())
// .orderByAsc("sl_sj,dc_ch,dc_pl")
// );
List<DmYdjhxf> list= mxService.tqSygd1(sygd.getBeginTime(),sygd.getEndTime());
Map map=new HashMap();
if (list.size()>0){
String beginTime=list.get(0).getGjjsXz();
String endTime=list.get(list.size()-1).getGjjsXz();
List<EmGcrl> emGcrls= gcrlService.list(new QueryWrapper<EmGcrl>().select("gl").between("gl",beginTime,endTime).eq("xxr","0"));
List<String> gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList());
map.put("gcrl",gcrl);
}
// if (list.size()>0){
// String beginTime=list.get(0).getGjjsXz();
// String endTime=list.get(list.size()-1).getGjjsXz();
// List<EmGcrl> emGcrls= gcrlService.list(new QueryWrapper<EmGcrl>().select("gl").between("gl",beginTime,endTime).eq("xxr","0"));
// List<String> gcrl = emGcrls.stream().map(EmGcrl::getGl).collect(Collectors.toList());
// map.put("gcrl",gcrl);
// }
map.put("list",list);
return new ResultBean(map);
}

12
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
Unescape View File

@ -27,10 +27,7 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.jhgk.DmSygdService;
import com.dsic.gj_erp.service.jhgk.DmTzjhService;
import com.dsic.gj_erp.service.jhgk.DmXbjhService;
import com.dsic.gj_erp.service.jhgk.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -57,8 +54,6 @@ import java.util.stream.Collectors;
@Service
public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> implements DmSygdMxService {
@Resource
private EmGcrlMapper gcrlMapper;
@Resource
private DmSygdService sygdService;
@Resource
@ -740,7 +735,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
return new ResultBean(null);
}
//根据船号+批量分组
Map<String, List<DmSygdMx>> map = list.stream().collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl()));
Map<String, List<DmSygdMx>> map = list.stream().filter(mx -> Objects.nonNull(mx.getTzbh())) // group by 的字段不能有null值
.collect(Collectors.groupingBy(x -> x.getDcCh() + x.getDcPl()));
List<DmSygd> sygdList = new ArrayList<>();
for (String key : map.keySet()) {
DmSygd sygd = new DmSygd();
@ -926,7 +922,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
int index;
if (count>0){
index= (fds.length/2)+1;
}else {
index= fds.length/2;
}
@ -945,6 +940,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
}
ydjhxf1.setSkbs(l.getSkbs2());
ydjhxf1.setSkqgks(l.getSkqgks2());
ydjhxf1.setFdxq(l.getFdxq());
list2.add(l);
list2.add(ydjhxf1);
}

6
src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
Unescape View File

@ -424,6 +424,7 @@
<select id="tqSygd1" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhxf">
SELECT aa.dc_ch,aa.dc_pl,aa.dc_fd,
(SELECT COUNT(c) from
( SELECT COUNT(1) as c
@ -514,9 +515,10 @@
(SELECT a.qgrq from
( SELECT row_number() over(partition by DC_CH,DC_PL order by qgrq ) rn,DC_CH,DC_PL,qgrq from dm_sygd_mx WHERE
dm_sygd_mx.dc_ch=aa.dc_ch and dm_sygd_mx.dc_pl=aa.dc_pl and dm_sygd_mx.kw='11'
)a WHERE rn=1) as 'skqgks2'
)a WHERE rn=1) as 'skqgks2',
aa.jssj as fdxq
from (
SELECT dc_ch,dc_pl,dc_fd from dm_sygd_mx where dm_sygd_mx.jssj between #{begin} and #{end}
SELECT dc_ch,dc_pl,dc_fd,Min(jssj) as jssj from dm_sygd_mx where dm_sygd_mx.jssj between #{begin} and #{end}
GROUP BY dc_ch,dc_pl,dc_fd
)aa ORDER BY aa.dc_ch,aa.dc_pl
</select>

Write Preview
Loading…
Cancel
Save