diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java index d78ef8a..0b326bb 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBzryController.java @@ -49,6 +49,7 @@ public class DmBzryController { StrUtil.isNotEmpty((String)map.get("zyq")),"zyq",(String)map.get("zyq") ).like( StrUtil.isNotEmpty((String)map.get("userName")),"user_name",(String)map.get("userName")) + .eq(StrUtil.isNotEmpty((String)map.get("zt")),"zt",map.get("zt")) ); // list.forEach(e->{ // e.setZzt(e.getZt()); diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 9297d5e..141f03c 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -34,7 +34,7 @@ public interface DmYdjhMapper extends BaseMapper { List getTzjh1(@Param("begin") String begin, @Param("end") String end); - List getDhjh1(List ids); + List getDhjh1(String id); List getSljh1(@Param("begin") String begin, @Param("end") String end); List getPwjh1(@Param("begin") String begin, @Param("end") String end); List getQgjh1(@Param("begin") String begin, @Param("end") String end); diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/tlt/七跨型板.java b/src/main/java/com/dsic/gj_erp/pc/dto/tlt/七跨型板.java index ee1de29..0f0817d 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/tlt/七跨型板.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/tlt/七跨型板.java @@ -19,7 +19,6 @@ public class 七跨型板 extends 套料图工序 { .add(Constant.工序.号料) .add(Constant.工序.切割) .add(Constant.工序.打磨) - .add(Constant.工序.自由边处理) .add(Constant.工序.曲型) .build(); return this; @@ -37,7 +36,6 @@ public class 七跨型板 extends 套料图工序 { .add(Constant.工序.号料) .add(Constant.工序.切割) .add(Constant.工序.打磨) - .add(Constant.工序.自由边处理) .add(Constant.工序.曲型) .build(); return this; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index f1344d6..82182ee 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java @@ -70,7 +70,7 @@ public class 三月滚动接口 { }); }); - sygdMxService.saveBatch(mxList,500); + //sygdMxService.saveBatch(mxList,500); ljList.forEach(lj-> mxList.forEach(mx->{ if (lj.getDcch().equals(mx.getDcCh()) @@ -79,7 +79,7 @@ public class 三月滚动接口 { lj.setParentId(mx.getId()); } })); - ljService.saveBatch(ljList,500); + //ljService.saveBatch(ljList,500); List list= sygdMxService.tqSygd1(begin,end); ResultBean r = new ResultBean(list); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java index 1d67d83..a5c86de 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java @@ -259,13 +259,12 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme List idList = ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList()); - - List dh= baseMapper.getDhjh1(idList); + idList.forEach(item->{ + List dh= baseMapper.getDhjh1(item); if (dh.size()>0){ - dhService.saveBatch(dh); - } + }); if (idList.size() > 100) { List list = idList.subList(idList.size() / 100 * 100, idList.size()); diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 9def921..8c0d73a 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -2,6 +2,8 @@ package com.dsic.gj_erp.service.zyjh; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -42,11 +44,19 @@ public class ZyjhService extends ServiceImpl { } public void updateForSl(ShangLiao sl){ + String date=DateUtil.date().toString("yyyy/MM/dd"); LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - .set(DmYdjh::getSlycldw, sl.getYdjh().getSlycldw()) - .set(DmYdjh::getSlyclcs, sl.getYdjh().getSlyclcs()) - .set(DmYdjh::getSlfkrq, sl.getYdjh().getSlfkrq()) - .set(DmYdjh::getSlfkry, sl.getYdjh().getSlfkry()) + //上料 + .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlycldw()),DmYdjh::getSlycldw, sl.getYdjh().getSlycldw()) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlyclcs()),DmYdjh::getSlyclcs, sl.getYdjh().getSlyclcs()) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlfkry()),DmYdjh::getSlfkrq, date) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getSlfkry()),DmYdjh::getSlfkry, sl.getYdjh().getSlfkry()) + + //理料 + .set(ObjUtil.isNotEmpty(sl.getYdjh().getLldw()),DmYdjh::getLldw, sl.getYdjh().getLldw()) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlcs()),DmYdjh::getLlcs, sl.getYdjh().getLlcs()) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlfkry()),DmYdjh::getLlfkrq, date) + .set(ObjUtil.isNotEmpty(sl.getYdjh().getLlfkry()),DmYdjh::getLlfkry, sl.getYdjh().getLlfkry()) .eq(DmYdjh::getId, sl.getYdjh().getId()); switch (sl.getType()){ diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 25af359..d631eeb 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -445,12 +445,7 @@ MS_DDMXP.WPKD, MS_DDMXP.RKXH, MS_DDJBP.dhqdh) dhxx on dhxx.dhqdh = dm_ydjh.dhqd where - and dm_ydjh.id in - - #{item} - - ORDER BY dm_ydjh.dc_ch, - dm_ydjh.dc_pl + dm_ydjh.id =#{id}