From cb5e856e45a777f861c1693fdc35e9634f6dfb8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 7 Nov 2024 16:57:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=96=E6=B6=88=E6=97=A5=E6=9C=9F=E9=99=90=E5=88=B6?= =?UTF-8?q?=202.=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/kban/KbanController.java | 14 +++++ .../controller/zyjh/ZyjhController.java | 2 +- .../dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 57 +++++++++++-------- .../com/dsic/gj_erp/service/KbanService.java | 12 +++- .../service/jhgk/impl/DmYdjhServiceImpl.java | 6 +- .../dsic/gj_erp/service/zyjh/ZyjhService.java | 7 +++ .../resources/mappers/jhgk/DmYdjhMapper.xml | 15 ++++- .../resources/mappers/kban/KbanMapper.xml | 2 +- 8 files changed, 85 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java index 417fe81..ddf3c81 100644 --- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java +++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; @RestController @@ -30,6 +32,14 @@ public class KbanController { private final DmBzryService cqService; private final KbanService kbanService; + /** + * 获取所有未处理批次信息 + */ + @GetMapping("wcl") + public ResultBean getWcl(){ + return new ResultBean<>(zyjhService.getWcl()); + } + /** * 看板线表计划相关数据 */ @@ -166,9 +176,13 @@ public class KbanController { List ryList=cqService.list(Wrappers.lambdaQuery() .isNotNull(DmBzry::getUserCode).isNotNull(DmBzry::getZt).ne(DmBzry::getZt,"")); + List collect = ryList.stream().filter(item -> "01".equals(item.getZt())).collect(Collectors.toList()); + Map map=new HashMap<>(); map.put("total",ryList.size()); map.put("rows",ryList); + map.put("bb", collect.size()); + map.put("eb",ryList.size()-collect.size()); return new ResultBean<>(map); } } diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 6c92c67..20fa1f1 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -223,7 +223,7 @@ public class ZyjhController { date=search.getSljhrq(); } List list = zyjhService.list(Wrappers.lambdaQuery() - .le(DmYdjh::getSljhrq, date) +// .le(DmYdjh::getSljhrq, date) .eq(StrUtil.isNotEmpty(search.getZt()),DmYdjh::getZt, search.getZt()) .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch()) .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl()) 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 ca9f1bf..d70e161 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 @@ -13,7 +13,7 @@ import java.util.Map; /** *

- * Mapper 接口 + * Mapper 接口 *

* * @author xn @@ -21,37 +21,48 @@ import java.util.Map; */ public interface DmYdjhMapper extends BaseMapper { - List getSygdmx(String nextMonth); -// List getTzjh(@Param("begin") String begin, @Param("end") String end); - List getTzjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); - List getDhjh(@Param("begin") String begin, @Param("end") String end); - List getSljh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); - List getPwjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); - List getQgjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); - int xfbc(List ids); - int tqlj(List ids); + List getSygdmx(String nextMonth); + // List getTzjh(@Param("begin") String begin, @Param("end") String end); + List getTzjh(@Param("list") List list, @Param("bzry") String bzry, @Param("bzrq") String bzrq); + List getDhjh(@Param("begin") String begin, @Param("end") String end); - List getTzjh1(@Param("begin") String begin, @Param("end") String end); - 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); + List getSljh(@Param("list") List list, @Param("bzry") String bzry, @Param("bzrq") String bzrq); - @MapKey("kw") - Map gekuachaliang(String from,String to,String zt); + List getPwjh(@Param("list") List list, @Param("bzry") String bzry, @Param("bzrq") String bzrq); - List> jhwcqk(String from,String to); + List getQgjh(@Param("list") List list, @Param("bzry") String bzry, @Param("bzrq") String bzrq); - List> gyfcl(); + int xfbc(List ids); - List> gxjhwcqk(String from,String to); + int tqlj(List ids); - List> gcjd(List czbh); - DmYdjh getYdjhMin(@Param("dcch") String dcch, @Param("dcpl") String dcpl); - List getydjhhz(Map map ); + List getTzjh1(@Param("begin") String begin, @Param("end") String end); + 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); + + @MapKey("kw") + Map gekuachaliang(String from, String to, String zt); + + List> jhwcqk(String from, String to); + + List> gyfcl(); + + List> gxjhwcqk(String from, String to); + + List> gcjd(List czbh); + + DmYdjh getYdjhMin(@Param("dcch") String dcch, @Param("dcpl") String dcpl); + + List getydjhhz(Map map); + + List> getWcl(); } diff --git a/src/main/java/com/dsic/gj_erp/service/KbanService.java b/src/main/java/com/dsic/gj_erp/service/KbanService.java index 83b234c..177621c 100644 --- a/src/main/java/com/dsic/gj_erp/service/KbanService.java +++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java @@ -55,6 +55,8 @@ public class KbanService { List> everyKw = kbanMapper.getEveryKw(from, to); AtomicInteger sl=new AtomicInteger(0); AtomicInteger slc=new AtomicInteger(0); + AtomicInteger kw1=new AtomicInteger(0); + AtomicInteger kw1c=new AtomicInteger(0); AtomicInteger kw2=new AtomicInteger(0); AtomicInteger kw2c=new AtomicInteger(0); AtomicInteger kw3=new AtomicInteger(0); @@ -70,6 +72,14 @@ public class KbanService { if (zt>=42){ slc.incrementAndGet(); } + if (kw==1){ + if (zt>=42){ + kw1.incrementAndGet(); + } + if (zt==52||zt==62){ + kw1c.incrementAndGet(); + } + } if (kw==2){ if (zt>=42){ kw2.incrementAndGet(); @@ -95,7 +105,7 @@ public class KbanService { } } }); - List zsl = Arrays.asList(sl.get(),kw2.get(),kw3.get(),kw4.get()); + List zsl = Arrays.asList(sl.get(),kw1.get(),kw2.get(),kw3.get(),kw4.get()); List kwc = Arrays.asList(slc.get(),kw2c.get(),kw3c.get(),kw4c.get()); List wcl = Arrays.asList(sl.get()-slc.get(),kw2.get()-kw2c.get(),kw3.get()-kw3c.get(),kw4.get()-kw4c.get()); map.put("zsl",zsl);//总数量 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 986e4ec..350048d 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 @@ -245,10 +245,11 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme String bzry= (String) request.getAttribute("yhms"); String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + String gxsj=DateUtil.date().toString("yyyy/MM/dd HH:mm:ss"); //工单号 List updateList = ydjhList.stream() .filter(item->StrUtil.isNotEmpty(item.getSljhrq())) - .map(this::ofXf).collect(Collectors.toList()); + .map(item->ofXf(item,gxsj)).collect(Collectors.toList()); this.updateBatchById(updateList); @@ -304,7 +305,7 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme publisher.publishEvent(ydjhList); } - private DmYdjh ofXf(DmYdjh item){ + private DmYdjh ofXf(DmYdjh item,String gxsj){ Long djh=this.handlerDjh(item); DmYdjh dmYdjh = new DmYdjh(); dmYdjh.setId(item.getId()); @@ -312,6 +313,7 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme String perfix=item.getSljhrq().replace("/",""); perfix=perfix.substring(2); dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh))); + dmYdjh.setGxsj(gxsj); return dmYdjh; } 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 64df81d..c9ab06b 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 @@ -29,6 +29,13 @@ public class ZyjhService extends ServiceImpl { private final DmCbxxpService dmCbxxpService; private final RedisTemplate redisTemplate; + /** + * 获取所有未处理批次 + */ + public List> getWcl(){ + return baseMapper.getWcl(); + } + public List> gcjd(){ ImmutableMap map = ImmutableMap.of("flag", true); List list = dmCbxxpService.getList(map); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index f2cce31..5172651 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -888,8 +888,19 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} - - + diff --git a/src/main/resources/mappers/kban/KbanMapper.xml b/src/main/resources/mappers/kban/KbanMapper.xml index 473b9ed..49cf90a 100644 --- a/src/main/resources/mappers/kban/KbanMapper.xml +++ b/src/main/resources/mappers/kban/KbanMapper.xml @@ -7,7 +7,7 @@