diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 8644437..1c19631 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -43,6 +43,13 @@ public class StockController { return Result.success(); } + @PostMapping("/trStockTable") + @ApiOperation(value = "清空盘点") + public Result trStockTable() { + stockService.trStockTable(); + return Result.success(); + } + @GetMapping("/export/model") @ApiOperation(value = "库存模板下载") public void download(HttpServletResponse response) throws IOException { 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 2e3c2ed..77a1237 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -422,5 +422,7 @@ public class StockService { } - + public void trStockTable() { + stockMapper.truncate(); + } } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index e7f2dc1..548fe28 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -169,23 +169,25 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { } } else if (Cmd.E.name().equals(ksecInfo.getType())) { - //盘点 - //转球机到盘点位 然后拍照 - tcpLogger.info(body); - if(!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)){ - //需要把stock表truncate - FileUtil.save(lotnum,"lastLotnum"); - tcpLogger.info("truncate table ,last lotnum:{},new lotnum:{}",lastLotnum,lotnum); - plcService.truncateStock(); - lastLotnum = lotnum; - } - log.info("orderInfo:{}", plcCmdInfo.toString()); - plcCmdInfo.setTimes(1); - Boolean ok = plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode()); - if(ok){ - ksecInfo.getData().setAckStatus(1); - }else { - ksecInfo.getData().setAckStatus(0); + if(!(ksecInfo.getData().getFromColumn()== 0 && ksecInfo.getData().getFromRow() == 0)) { + //盘点 + //转球机到盘点位 然后拍照 + tcpLogger.info(body); + if (!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)) { + //需要把stock表truncate + FileUtil.save(lotnum, "lastLotnum"); + tcpLogger.info("truncate table ,last lotnum:{},new lotnum:{}", lastLotnum, lotnum); + plcService.truncateStock(); + lastLotnum = lotnum; + } + log.info("orderInfo:{}", plcCmdInfo.toString()); + plcCmdInfo.setTimes(1); + Boolean ok = plcService.check(plcCmdInfo, ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode()); + if (ok) { + ksecInfo.getData().setAckStatus(1); + } else { + ksecInfo.getData().setAckStatus(0); + } } ctx.channel().writeAndFlush(ksecInfo); } diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 4b087a7..23c723d 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -7,14 +7,14 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 15 - password: Leaper@123 + password: root poolPreparedStatements: true testOnBorrow: true testOnReturn: false testWhileIdle: false timeBetweenEvictionRunsMillis: 60000 type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://192.168.77.91:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: root validationQuery: SELECT 1 FROM DUAL # --------本服务端口号 diff --git a/web/src/main/resources/libs/RXTXcomm.jar b/web/src/main/resources/libs/RXTXcomm.jar index 84e5f01..e1e7503 100644 Binary files a/web/src/main/resources/libs/RXTXcomm.jar and b/web/src/main/resources/libs/RXTXcomm.jar differ diff --git a/web/src/main/resources/libs/connect-lib.jar b/web/src/main/resources/libs/connect-lib.jar new file mode 100644 index 0000000..19180d6 Binary files /dev/null and b/web/src/main/resources/libs/connect-lib.jar differ diff --git a/web/src/main/resources/libs/javaRFID-helloworld.jar b/web/src/main/resources/libs/javaRFID-helloworld.jar new file mode 100644 index 0000000..0e90d9f Binary files /dev/null and b/web/src/main/resources/libs/javaRFID-helloworld.jar differ diff --git a/web/src/main/resources/libs/lib_reader.jar b/web/src/main/resources/libs/lib_reader.jar new file mode 100644 index 0000000..cb23ff1 Binary files /dev/null and b/web/src/main/resources/libs/lib_reader.jar differ