清空盘点

行列为0不盘点

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 {

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -422,5 +422,7 @@ public class StockService {
     }
 
 
-
+    public void trStockTable() {
+        stockMapper.truncate();
+    }
 }

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -169,24 +169,26 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     }
                 } else if (Cmd.E.name().equals(ksecInfo.getType())) {
 
+                    if(!(ksecInfo.getData().getFromColumn()== 0 && ksecInfo.getData().getFromRow() == 0)) {
                         //盘点
                         //转球机到盘点位 然后拍照
                         tcpLogger.info(body);
-                    if(!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)){
+                        if (!StringUtils.isEmpty(lotnum) && !lotnum.equals(lastLotnum)) {
                             //需要把stock表truncate
-                        FileUtil.save(lotnum,"lastLotnum");
-                        tcpLogger.info("truncate table ,last lotnum:{},new lotnum:{}",lastLotnum,lotnum);
+                            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){
+                        Boolean ok = plcService.check(plcCmdInfo, ksecInfo.getData().getCmdName(), dataInfo.getCode(), dataInfo.getTrayCode());
+                        if (ok) {
                             ksecInfo.getData().setAckStatus(1);
-                    }else {
+                        } else {
                             ksecInfo.getData().setAckStatus(0);
                         }
+                    }
                     ctx.channel().writeAndFlush(ksecInfo);
                 }
                 //找到该货位的最后一张照片与现在的照片比照

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
 # --------本服务端口号