|
|
|
@ -79,10 +79,10 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
|
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
|
//月度计划汇总
|
|
|
|
//月度计划汇总
|
|
|
|
//汇总时生成切割之前的派工单 状态为空
|
|
|
|
//汇总时生成切割之前的派工单 状态为空
|
|
|
|
String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
|
|
|
|
// String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
|
|
|
|
String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd");
|
|
|
|
// String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd");
|
|
|
|
// String begin="2023/08/01";
|
|
|
|
String begin="2023/08/01";
|
|
|
|
// String end ="2023/08/31";
|
|
|
|
String end ="2023/08/31";
|
|
|
|
//图纸计划
|
|
|
|
//图纸计划
|
|
|
|
|
|
|
|
|
|
|
|
List<PgdTzjh> tzjhList=tzjhService.list(new QueryWrapper<PgdTzjh>().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq"));
|
|
|
|
List<PgdTzjh> tzjhList=tzjhService.list(new QueryWrapper<PgdTzjh>().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq"));
|
|
|
|
@ -95,8 +95,12 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
|
|
|
|
//订货清单
|
|
|
|
//订货清单
|
|
|
|
List<PgdDh> dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
|
|
|
|
List<PgdDh> dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
|
|
|
|
if (dhList.size()<1){
|
|
|
|
if (dhList.size()<1){
|
|
|
|
baseMapper.getDhjh(begin,end);
|
|
|
|
List<PgdDh> dh= baseMapper.getDhjh(begin,end);
|
|
|
|
dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
|
|
|
|
if (dh.size()>0){
|
|
|
|
|
|
|
|
dhService.saveBatch(dh);
|
|
|
|
|
|
|
|
dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//上料计划
|
|
|
|
//上料计划
|
|
|
|
List<PgdSljh> slList=slService.list(new QueryWrapper<PgdSljh>().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq"));
|
|
|
|
List<PgdSljh> slList=slService.list(new QueryWrapper<PgdSljh>().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq"));
|
|
|
|
@ -127,15 +131,20 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
|
|
|
|
|
|
|
|
|
|
|
|
//下发 派工单状态改为编制 生成零件信息
|
|
|
|
//下发 派工单状态改为编制 生成零件信息
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
|
|
|
|
@Transactional
|
|
|
|
public void xf(List<DmYdjh> ydjhList){
|
|
|
|
public void xf(List<DmYdjh> ydjhList){
|
|
|
|
|
|
|
|
|
|
|
|
//修改状态
|
|
|
|
//修改状态
|
|
|
|
List<String> idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
|
|
|
|
List<String> idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
|
|
|
|
|
|
|
|
//修改汇总状态 改为 编制
|
|
|
|
|
|
|
|
int num= baseMapper.xfbc(idList);
|
|
|
|
|
|
|
|
if(num<1){
|
|
|
|
|
|
|
|
throw new RuntimeException("请先汇总，后下发！");
|
|
|
|
|
|
|
|
}
|
|
|
|
this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
|
|
|
|
this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
|
|
|
|
.in( "id",idList)
|
|
|
|
.in( "id",idList)
|
|
|
|
);
|
|
|
|
);
|
|
|
|
//修改汇总状态 改为 编制
|
|
|
|
|
|
|
|
baseMapper.xfbc(idList);
|
|
|
|
|
|
|
|
//生成对应零件信息 bom->tzjhLj
|
|
|
|
//生成对应零件信息 bom->tzjhLj
|
|
|
|
baseMapper.tqlj(idList);
|
|
|
|
baseMapper.tqlj(idList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
