diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 7d05681..fae3661 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -234,6 +234,8 @@ public class DmYdjh implements Serializable { private String ylbs;//余料标识 + private String plxh;//批量序号,用于语音批次派工 + @TableId(value = "id", type = IdType.ASSIGN_UUID) private String id; 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 e439692..07f4479 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 @@ -9,6 +9,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -45,7 +47,7 @@ import lombok.AllArgsConstructor; */ @RestController @RequestMapping("kban") -@AllArgsConstructor +@RequiredArgsConstructor public class KbanController { private final ZyjhService zyjhService; @@ -54,6 +56,9 @@ public class KbanController { private final SyMsgService msgService; private final DmSygdMxService service; + @Value("${pdfUri}") + private String pdfUri; + /** * 中日程表格数据 */ @@ -75,15 +80,15 @@ public class KbanController { */ @GetMapping("/pdfList") public ResultBean pdfList(String dcCh,String dcPl) { - String absolutePath = FileUtil.getWebRoot().getAbsolutePath(); List ls; try { - ls = FileUtil.loopFiles(StrUtil.format("{}/../static/upload/{}/{}/PDF",absolutePath, dcCh, dcPl)); + ls = FileUtil.loopFiles(StrUtil.format("{}/{}/{}/PDF", pdfUri,dcCh, dcPl)); + return new ResultBean<>(ls.stream().map(FileUtil::getPrefix)); }catch (Exception e){ - ls = FileUtil.loopFiles(StrUtil.format("{}/static/upload/{}/{}/PDF",absolutePath, dcCh, dcPl)); + e.printStackTrace(); } - return new ResultBean<>(ls.stream().map(FileUtil::getPrefix)); + return new ResultBean<>(); } /** 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 534e7d6..b0c67ca 100644 --- a/src/main/java/com/dsic/gj_erp/service/KbanService.java +++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java @@ -165,7 +165,7 @@ public class KbanService { if (zt>=11){ sl.incrementAndGet(); } - if (zt>=42){ + if (zt>=21){ slc.incrementAndGet(); } if (kw==1){ 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 350048d..599957d 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 @@ -246,6 +246,14 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); String gxsj=DateUtil.date().toString("yyyy/MM/dd HH:mm:ss"); + Map> collect = ydjhList.stream().collect(Collectors.groupingBy(item -> item.getDcCh() + "_" + item.getDcPl())); + collect.forEach((key,val)->{ + String plXh = this.getPlGdh(); + val.forEach(item->{ + item.setPlxh(plXh); + }); + }); + //工单号 List updateList = ydjhList.stream() .filter(item->StrUtil.isNotEmpty(item.getSljhrq())) @@ -314,6 +322,7 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme perfix=perfix.substring(2); dmYdjh.setDjh(StrUtil.format("{}{}",perfix, String.format("%03d",djh))); dmYdjh.setGxsj(gxsj); + dmYdjh.setPlxh(item.getPlxh()); return dmYdjh; } @@ -326,4 +335,15 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme return redisTemplate.opsForHash().increment(key, item.getSljhrq(), 1); } + private String getPlGdh(){ + String date=DateUtil.date().toString("yyyyMMdd"); + String key="ZYJH_PLGDH::"; + Object o = redisTemplate.opsForHash().get(key, date); + if (ObjUtil.isEmpty(o)) { + redisTemplate.opsForHash().put(key, date,100); + } + Long xh=redisTemplate.opsForHash().increment(key, date, 1); + return StrUtil.format("{}{}",date, String.format("%03d",xh)); + } + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25cc696..b532c40 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -45,5 +45,7 @@ zxtbm=PS spring.resources.static-locations=file:./static +pdfUri=D:/javaweb/static/upload + diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 2d3e05b..d3e11b7 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -904,7 +904,7 @@ 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 bdde41d..c2f3e7f 100644 --- a/src/main/resources/mappers/kban/KbanMapper.xml +++ b/src/main/resources/mappers/kban/KbanMapper.xml @@ -111,7 +111,7 @@