From fe259888f74966d606e03becd3d39e0d4493c49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Wed, 19 Jun 2024 16:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=B8=E5=B7=9E=E5=92=8CWMS=E9=80=9A?= =?UTF-8?q?=E4=BF=A1=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8BgetcheckLogOne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/encryptor/Encryptor.java | 2 +- .../web/config/ConfigProperties.java | 2 + .../web/controller/CheckLogController.java | 7 ++ .../com/zhehekeji/web/pojo/CheckLogOne.java | 13 ++++ .../main/java/com/zhehekeji/web/pojo/Obg.java | 11 +++ .../web/pojo/stock/CheckLogSearch.java | 24 +++++++ .../web/service/CheckLogService.java | 71 +++++++++++++++++++ .../com/zhehekeji/web/service/PlcService.java | 4 +- web/src/main/resources/application-prod.yml | 2 + 9 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 web/src/main/java/com/zhehekeji/web/pojo/CheckLogOne.java create mode 100644 web/src/main/java/com/zhehekeji/web/pojo/Obg.java diff --git a/modules/common/src/main/java/encryptor/Encryptor.java b/modules/common/src/main/java/encryptor/Encryptor.java index 773e81b..d66035f 100644 --- a/modules/common/src/main/java/encryptor/Encryptor.java +++ b/modules/common/src/main/java/encryptor/Encryptor.java @@ -25,7 +25,7 @@ public class Encryptor { public static void main(String[] args) { - String noEncrypt = "BFEBFBFF000A0671AK7211183"; + String noEncrypt = "BFEBFBFF000306F2WD-WXD2A136C7UD"; String encrypt = Encryptor.encryptStr(noEncrypt); System.out.println(encrypt); } diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index 1993ede..4abefb6 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -31,6 +31,8 @@ public class ConfigProperties { private String userUrl; + private String picIpPort; + private KSEC ksec; private LightSource lightSource; diff --git a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java index 4c22b24..7fb588a 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CheckLogController.java @@ -5,6 +5,8 @@ import com.zhehekeji.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.web.entity.CheckLog; import com.zhehekeji.web.entity.StockLog; +import com.zhehekeji.web.pojo.CheckLogOne; +import com.zhehekeji.web.pojo.Obg; import com.zhehekeji.web.pojo.stock.CheckLogSearch; import com.zhehekeji.web.pojo.stock.StockLogSearch; import com.zhehekeji.web.service.CheckLogService; @@ -35,4 +37,9 @@ public class CheckLogController { } + @ApiOperation("盘点信息") + @PostMapping("getOne") + public Obg getOne(@RequestBody Obg checkLogSearch){ + return checkLogService.getOne(checkLogSearch); + } } diff --git a/web/src/main/java/com/zhehekeji/web/pojo/CheckLogOne.java b/web/src/main/java/com/zhehekeji/web/pojo/CheckLogOne.java new file mode 100644 index 0000000..af5158b --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/pojo/CheckLogOne.java @@ -0,0 +1,13 @@ +package com.zhehekeji.web.pojo; + +import lombok.Data; + +@Data +public class CheckLogOne { + private String flag; + private String from_tagid; + private String loc; + private String to_tagid; + private String jobnum; + private String picture_routesid; +} diff --git a/web/src/main/java/com/zhehekeji/web/pojo/Obg.java b/web/src/main/java/com/zhehekeji/web/pojo/Obg.java new file mode 100644 index 0000000..268233f --- /dev/null +++ b/web/src/main/java/com/zhehekeji/web/pojo/Obg.java @@ -0,0 +1,11 @@ +package com.zhehekeji.web.pojo; + +import com.zhehekeji.web.pojo.stock.CheckLogSearch; +import lombok.Data; + +import java.util.List; + +@Data +public class Obg { + private List data; +} diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java index 356c0e7..d037e13 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java @@ -12,6 +12,10 @@ public class CheckLogSearch { private String lotnum; + private String loc; + private String date; + private String tagid; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime startTimestamp; @@ -20,6 +24,8 @@ public class CheckLogSearch { private Integer streetId; + private String streetPlc; + @ApiModelProperty("左右 1：左 2：右") private Integer leftRight; @@ -28,9 +34,27 @@ public class CheckLogSearch { private Integer row; + private Integer jobnum; + private Integer column; private Integer pageSize; private Integer pageNum; + public CheckLogSearch getLocInfo(){ + if(this.loc!=null){ + this.streetPlc = this.loc.substring(0,3); + this.column = Integer.parseInt(this.loc.substring(4,7)); + this.leftRight = Integer.parseInt(this.loc.substring(3,4)); + this.row = Integer.parseInt(this.loc.substring(7,10)); + } + return this; + } + + public static void main(String[] args) { + CheckLogSearch checkLogSearch = new CheckLogSearch(); + checkLogSearch.setLoc("0011010003000"); + checkLogSearch.getLocInfo(); + System.out.println(checkLogSearch); + } } diff --git a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java index 09cecfd..f4ddd6d 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CheckLogService.java @@ -3,14 +3,23 @@ package com.zhehekeji.web.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zhehekeji.web.config.ConfigProperties; import com.zhehekeji.web.entity.CheckLog; +import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.mapper.CheckLogMapper; +import com.zhehekeji.web.pojo.CheckLogOne; +import com.zhehekeji.web.pojo.Obg; import com.zhehekeji.web.pojo.stock.CheckLogSearch; import com.zhehekeji.web.pojo.street.StreetVO; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -23,6 +32,9 @@ public class CheckLogService { @Resource private StreetService streetService; + @Resource + private ConfigProperties configProperties; + public PageInfo list(CheckLogSearch search){ List list = streetService.list(); Map map = new HashMap<>(); @@ -59,4 +71,63 @@ public class CheckLogService { }); return new PageInfo<>(stockChecks); } + + public Obg getOne(Obg checkLogSearch) { + Obg obg = new Obg<>(); + List checkLogOnes = new ArrayList<>(); + for(CheckLogSearch search : checkLogSearch.getData()){ + CheckLogOne checkLogOne = new CheckLogOne(); + search.getLocInfo(); + Street streetVO = streetService.getStreetByPlcId(search.getStreetPlc()); + // 定义日期格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + // 将字符串转换为LocalDate对象 + LocalDate specifiedDate = LocalDate.parse(search.getDate(), formatter); + + // 获取指定日期的开始时间和结束时间 + +// 生成当天最早时间 + LocalDateTime dateStart = specifiedDate.atStartOfDay(); + // 生成当天最晚时间 + LocalDateTime dateEnd = specifiedDate.atTime(23, 59, 59); + + + + CheckLog checkLog = checkLogMapper.selectOne(new QueryWrapper() + .eq(search.getJobnum()!=null,"check_num",search.getStreetPlc()+"_"+search.getJobnum()) + .eq(streetVO.getId()!=null,"street_id",streetVO.getId()) + .eq(search.getRow()!=null,"`row`",search.getRow()) + .eq(search.getColumn()!=null,"`column`",search.getColumn()) + .between("create_time", dateStart, dateEnd) + .eq(search.getLeftRight()!=null,"direction",search.getLeftRight()) + .orderByDesc("create_time") + .last("limit 1") + + ); + checkLogOne.setLoc(search.getLoc()); + + checkLogOne.setFlag("false"); + checkLogOne.setFrom_tagid(search.getTagid()); + if(checkLog != null){ + + checkLogOne.setJobnum(checkLog.getCheckNum().split("_")[1]); + + //图片 + checkLogOne.setPicture_routesid(configProperties.getPicIpPort()+checkLog.getPic()); + if(checkLog.getStatus()!= 1){ + checkLogOne.setFlag("true"); + checkLogOne.setTo_tagid(search.getTagid()); + } + } + checkLogOnes.add(checkLogOne); + } + obg.setData(checkLogOnes); + return obg; + } + + public static void main(String[] args) { + System.out.println("001_21316"); + + } } diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 186af94..9117433 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -866,7 +866,9 @@ public class PlcService { stock.setWmsCode(wmsCode); stockMapper.updateById(stock); } -// StockCheckRunnable stockCheckRunnable = new StockCheckRunnable(street,plcCmdInfo,cmdCode,stockMapper,path,checkLogMapper,configProperties.getScanCodeMode().getGoods(),wmsCode,wmsTrayCode,trayCode,trayCheck,configProperties,sensorGun); + + checkLog(stock); + //StockCheckRunnable stockCheckRunnable = new StockCheckRunnable(street,plcCmdInfo,cmdCode,stockMapper,path,checkLogMapper,configProperties.getScanCodeMode().getGoods(),wmsCode,wmsTrayCode,trayCode,trayCheck,configProperties,sensorGun); // threadPoolExecutor.execute(stockCheckRunnable); //还原相机 gyrateCameraByCode(cameraId, "C5"); diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 9f60935..bd98a19 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -96,6 +96,8 @@ scanCodeMode: # 照片 視頻保存多久 deleteFileDays: 365 +picIpPort: 127.0.0.1:5555/api/pic + rfid: codeType: ISO18000_6C scanTime: 2