From ff8604418428ce4491262b7a621a0ee293a39374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Tue, 3 Jun 2025 16:49:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=90=8E=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=93=81?= =?UTF-8?q?=E8=A7=84=E5=A4=B1=E8=B4=A5=E5=92=8C=E4=B8=AA=E6=95=B0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/entity/Stock.java | 3 ++ .../com/zhehekeji/web/pojo/AlgorithmPojo.java | 1 + .../zhehekeji/web/pojo/stock/StockStatus.java | 4 ++- .../web/service/EmptyCheckService.java | 6 ++-- .../com/zhehekeji/web/service/PlcService.java | 28 ++++++++----------- .../zhehekeji/web/service/StockService.java | 6 +++- web/src/main/resources/application-prod.yml | 2 +- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/entity/Stock.java b/web/src/main/java/com/zhehekeji/web/entity/Stock.java index 4d9e3b7..6b8b7a1 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Stock.java @@ -88,6 +88,9 @@ public class Stock { @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime exportTime; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + private String pcd;//点位文件路径 diff --git a/web/src/main/java/com/zhehekeji/web/pojo/AlgorithmPojo.java b/web/src/main/java/com/zhehekeji/web/pojo/AlgorithmPojo.java index 3e108d9..9739b74 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/AlgorithmPojo.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/AlgorithmPojo.java @@ -10,4 +10,5 @@ public class AlgorithmPojo { private String determinePath; //结果 private Boolean result; + private Boolean result3d; } diff --git a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java index 527bb30..7a5f25a 100644 --- a/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java +++ b/web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java @@ -14,7 +14,9 @@ public enum StockStatus { ERROR(1, "核对错误"), OTHER(4, "其他"), - MANUAL(3,"人工核对") + MANUAL(3,"人工核对"), + CATEGORY_ERROR(5, "品规失败"), + COUNT_ERROR(6,"个数失败") ; private Integer status; diff --git a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java index c1d3a2b..c1b0f1a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java +++ b/web/src/main/java/com/zhehekeji/web/service/EmptyCheckService.java @@ -227,7 +227,7 @@ public class EmptyCheckService { checkStatus.setRowStart(rowColumnStatus.getRowStart()); checkStatus.setRowEnd(rowColumnStatus.getRowEnd()); - ListstockList = new ArrayList<>(); + List stockList = new ArrayList<>(); //默认全部盘点正确 Map rowTabStatus = new LinkedHashMap<>(); int columns = 0; @@ -275,7 +275,9 @@ public class EmptyCheckService { checkStatus.setColumnTabStatus(columnTabStatus); checkStatus.setRowTabStatus(rowTabStatus); - checkStatus.setEmptyStatus(stockInit(rowColumnStatus.getRowStart(), rowColumnStatus.getRowEnd(), rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null,stockList)); + checkStatus.setEmptyStatus(stockInit(rowColumnStatus.getRowStart(), + rowColumnStatus.getRowEnd(), + rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null,stockList)); return checkStatus; } 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 3766e21..dd1455c 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -47,6 +47,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; +import static com.zhehekeji.web.pojo.stock.StockStatus.COUNT_ERROR; import static com.zhehekeji.web.service.client.GetPhotoDelayExecutor.cameraDelayTaskMap; @@ -280,7 +281,7 @@ public class PlcService { } else { delayTime = configProperties.getCameraConfig().getC2OutDelayCaptureTime(); } - sendHttp( street,plcCmdInfo.getLeftRight1()); +// sendHttp( street,plcCmdInfo.getLeftRight1()); //拍照拉平 } else if (code.startsWith("C3")) { @@ -294,7 +295,7 @@ public class PlcService { } else { delayTime = configProperties.getCameraConfig().getC4OutDelayCaptureTime(); } - sendHttp( street,plcCmdInfo.getLeftRight2()); +// sendHttp( street,plcCmdInfo.getLeftRight2()); } // path = PathUtil.createFileNameByRowColumn("jpg", cameraId, row, column); // path = cameraCapture(cameraId, delay, delayTime, path); @@ -733,15 +734,15 @@ public class PlcService { checkLog.setCategory(dataInfo.getTypeNum()); }else { - checkLog.setStatus(StockStatus.ERROR.getStatus()); - stock.setStatus(StockStatus.ERROR.getStatus()); + checkLog.setStatus(StockStatus.CATEGORY_ERROR.getStatus()); + stock.setStatus(StockStatus.CATEGORY_ERROR.getStatus()); } checkLog.setPic("http://"+street.getPlcIp()+":9007/pic/"+algorithmPojo.getDeterminePath()); stock.setCheckPic("http://"+street.getPlcIp()+":9007/pic/"+algorithmPojo.getDeterminePath()); }else { - checkLog.setStatus(StockStatus.ERROR.getStatus()); - stock.setStatus(StockStatus.ERROR.getStatus()); + checkLog.setStatus(StockStatus.CATEGORY_ERROR.getStatus()); + stock.setStatus(StockStatus.CATEGORY_ERROR.getStatus()); } checkLogMapper.insert(checkLog); @@ -847,11 +848,6 @@ public class PlcService { } - public static void main(String[] args) { - Street street = new Street(); - street.setPlcIp("127.0.0.1"); - sendHttp(street,1); - } public static AlgorithmPojo sendHttp(Street street,Integer direction ){ // 创建RestTemplate实例 @@ -922,13 +918,13 @@ public class PlcService { checkLog.setCount(count); stock.setCount(count); if(flag && checkLog.getWmsCount()==count&& checkLog.getWmsCategory().equals(checkLog.getCategory())){ - checkLog.setStatus(2); - stock.setStatus(2); + checkLog.setStatus(StockStatus.SUCCESS.getStatus()); + stock.setStatus(StockStatus.SUCCESS.getStatus()); }else { - checkLog.setStatus(1); - stock.setStatus(1); + checkLog.setStatus(StockStatus.COUNT_ERROR.getStatus()); + stock.setStatus(StockStatus.COUNT_ERROR.getStatus()); } - + stock.setEndTime( LocalDateTime.now()); checkLogMapper.updateById(checkLog); stockMapper.updateById(stock); return checkLog.getStatus()>2?1:0; diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index d2d6da3..efbb2e4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -108,7 +108,11 @@ public class StockService { } Map columnTabCorrectCount = new LinkedHashMap<>(); Map rowTabCorrectCount = new LinkedHashMap<>(); - List stocks = stockMapper.selectList(new QueryWrapper().select("status","`row`","`column`").eq("`street_id`",rowColumnStatus.getStreetId()).eq("direction",rowColumnStatus.getDirection()).eq("side",rowColumnStatus.getSide())); + List stocks = stockMapper.selectList(new QueryWrapper() + .select("status","`row`","`column`") + .eq("`street_id`",rowColumnStatus.getStreetId()) + .eq("direction",rowColumnStatus.getDirection()) + .eq("side",rowColumnStatus.getSide())); if(CollectionUtils.isEmpty(stocks)){ stockInit(rowColumnStatus.getRowStart(), rowColumnStatus.getRowEnd(), rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null,stocks); checkStatus.setStocks(stocks); diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 248f812..f6bd094 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -96,6 +96,6 @@ scanCodeMode: # 照片 視頻保存多久 deleteFileDays: 30 -productDoc: "C:\\Users\\昊天\\Desktop\\新建文本文档.txt" +productDoc: "D:/desktop/新建文本文档.txt" inventorySimulationFollow: false \ No newline at end of file