From 97b9db9d1993c491b1d7d293665d4dee1b9f5c93 Mon Sep 17 00:00:00 2001 From: wanghaotian Date: Mon, 27 Mar 2023 17:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=A1=E6=81=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=A2=9E=E5=8A=A0viewStatus=20-1:=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=9B=98=E7=82=B9=200:=E7=9B=98=E7=82=B9=E6=9C=AA=E6=A0=B8?= =?UTF-8?q?=E5=AF=B9=20=201=EF=BC=9A=E7=9B=98=E7=82=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=20=202=EF=BC=9A=E6=A0=B8=E5=AF=B9=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/java/com/zhehekeji/web/entity/Stock.java | 9 +++++++++ .../main/java/com/zhehekeji/web/service/PlcService.java | 2 +- .../com/zhehekeji/web/service/StockCheckRunnable.java | 2 +- .../java/com/zhehekeji/web/service/StockService.java | 6 +++--- .../com/zhehekeji/web/service/ksec/KsecNettyClient.java | 1 + 5 files changed, 15 insertions(+), 5 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 9d53521..3ef546a 100644 --- a/web/src/main/java/com/zhehekeji/web/entity/Stock.java +++ b/web/src/main/java/com/zhehekeji/web/entity/Stock.java @@ -70,6 +70,15 @@ public class Stock { @ApiModelProperty("0:未盘点 1：盘点异常 2：核对正确") private Integer status; + public void setStatus(Integer status){ + this.status = status; + this.viewStatus = status; + } + + @ApiModelProperty("-1:没有盘点 0:盘点未核对 1：盘点异常 2：核对正确") + @TableField(exist = false) + private Integer viewStatus; + @ApiModelProperty("操作前的图片") private String preoperationPic; 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 768fb0b..2c057c4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -590,7 +590,7 @@ public class PlcService { Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn()); //核对异常 if(stock == null){ - stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,null,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,null,null,path, LocalDateTime.now()); + stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),"", null,null,wmsCode,null,null,wmsTrayCode,"",orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),0,0,null,null,path, LocalDateTime.now()); stockMapper.insert(stock); }else { //stock.setStatus(status); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java b/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java index b588608..9bee84a 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockCheckRunnable.java @@ -97,7 +97,7 @@ public class StockCheckRunnable implements Runnable { status = 2; } if(stock == null){ - stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),scanCode, null,null,wmsCode,null,null,wmsTrayCode,trayCode,orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),status,null,null,path, LocalDateTime.now()); + stock = new Stock(null,null,plcCmdInfo.getOrderNum(),plcCmdInfo.getLotnum(),scanCode, null,null,wmsCode,null,null,wmsTrayCode,trayCode,orderInfo.getStreetId(),orderInfo.getLeftRight(),orderInfo.getSeparation(),orderInfo.getRow(),orderInfo.getColumn(),status,status,null,null,path, LocalDateTime.now()); stockMapper.insert(stock); }else { stock.setStatus(status); 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 f3a81c7..eabcff4 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -91,7 +91,7 @@ public class StockService { //checkStatus.setShelveId(rowColumnStatus.getShelveId()); - ListstockList = new ArrayList<>(); + List stockList = new ArrayList<>(); //默认全部盘点正确 Map rowTabStatus = new LinkedHashMap<>(); int columns = 0; @@ -204,7 +204,7 @@ public class StockService { Stock stock = new Stock(); stock.setColumn(j); stock.setRow(i); - stock.setStatus(0); + stock.setStatus(-1); //stock.setShelveId(shelveId); readyList.add(stock); } @@ -325,7 +325,7 @@ public class StockService { stock.setColumn(stockCheck.getColumn()); stock.setRow(stockCheck.getRow()); //stock.setShelveId(stockCheck.getShelveId()); - stock.setStatus(0); + stock.setViewStatus(-1); } List stockLogs = stockLogMapper.selectList(new QueryWrapper().eq("`row`",stockCheck.getRow()).eq("`column`",stockCheck.getColumn()).eq("street_id",stockCheck.getStreetId()).eq("direction",stockCheck.getDirection()).eq("side",stockCheck.getSide()).orderByDesc("create_time").last(" limit 2")); if(stockLogs.size() == 1){ diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java index e5e3b25..89a687f 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java @@ -47,6 +47,7 @@ public class KsecNettyClient { client.handler(new KescFilter(heart, plcService,this)); // 连接服务端 channel = client.connect(ksec.getIp(), ksec.getPort()).sync().channel(); + } /**