台湾盘点测试

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

@@ -50,7 +50,7 @@ public class StockLogService {
         if(search.getColumn() != null && search.getColumn() != 0){
             wrapper.eq("`column`",search.getColumn());
         }
-        wrapper.orderByDesc("shelve_id","`row`","`column`");
+        wrapper.orderByDesc("shelve_id","`row`","`column`","id");
         List<CheckLog>stockChecks = checkLogMapper.selectList(wrapper);
 
         return new PageInfo<>(stockChecks);

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

@@ -136,11 +136,13 @@ public class StockService {
                 for(String columnTab: rowColumnStatus.getColumnTabs()){
                     if(isRowColumnInTab(stock,columnTab,false)){
                         tabStatus(stock,columnTabStatus,columnTab);
-                        if(columnTabCorrectCount.get(columnTab) == null){
-                            columnTabCorrectCount.put(columnTab,1);
-                        }else {
-                            int c = columnTabCorrectCount.get(columnTab);
-                            columnTabCorrectCount.put(columnTab,c+1);
+                        if(stock.getStatus() != 0 && stock.getStatus() != 1) {
+                            if (columnTabCorrectCount.get(columnTab) == null) {
+                                columnTabCorrectCount.put(columnTab, 1);
+                            } else {
+                                int c = columnTabCorrectCount.get(columnTab);
+                                columnTabCorrectCount.put(columnTab, c + 1);
+                            }
                         }
                     }
                 }
@@ -151,7 +153,7 @@ public class StockService {
             String [] strings = entry.getKey().split(" - ");
             Integer tabStart = Integer.valueOf(strings[0]);
             Integer tabEnd = Integer.valueOf(strings[1]);
-            int counts = (tabEnd- tabStart) * rows;
+            int counts = (tabEnd- tabStart + 1) * rows;
             if(counts == entry.getValue()){
                 rowTabStatus.put(entry.getKey(),2);
             }
@@ -160,7 +162,7 @@ public class StockService {
             String [] strings = entry.getKey().split(" - ");
             Integer tabStart = Integer.valueOf(strings[0]);
             Integer tabEnd = Integer.valueOf(strings[1]);
-            int counts = (tabEnd- tabStart) * rows;
+            int counts = (tabEnd- tabStart + 1) * rows;
             if(counts == entry.getValue()){
                 columnTabStatus.put(entry.getKey(),2);
             }
@@ -206,9 +208,6 @@ public class StockService {
     }
 
     //0 : 未盘点   1：盘点异常   2：盘点正确
-    //1>0>2 替换为
-    // 盘点异常 未盘点  盘点正确
-    // 1000    100    10
 
     private void tabStatus(Stock stock,Map<String,Integer> tabStatus,String tab){
         if(tabStatus.get(tab) == null){

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

@@ -34,23 +34,16 @@ public class TestService {
 
             for(int i = 1;i<=row;i++){
                 for(int j = 1; j<= column;j++){
-                    String code = "123456789013";
+                    String code = "J83572603";
+                    if(j % 5==0){
+                        code = "dsawqwe";
+                    }
+
                     String taskId = i +"-"+ j+"-"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("hhmmss"));
                     PlcCmdInfo plcCmdInfo = new PlcCmdInfo(street.getPlcId(),taskId,1,leftRight,j,i,1,1,1,1,1,1,"");
                     plcCmdInfo.setTimes(1);
                     int co = j%3 + 1;
-                    plcService.check(plcCmdInfo,"E"+co,code,"123456789013");
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    plcService.gyrateCameraByCode(plcService.getCameraByPlcCmd(plcCmdInfo,leftRight),"C5");
-                    try {
-                        Thread.sleep(3000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
+                    plcService.check(plcCmdInfo,"E"+co,code,code);
                 }
             }
     }

web/src/main/resources/application-prod.yml

@@ -27,13 +27,13 @@ userUrl: http://115.236.65.98:11001
 # ----默认摄像头的连接信息
 cameraConfig:
   # ------------球機選擇--- 0:利珀     1：海康
-  cameraType: 0
+  cameraType: 1
   cameraPassword: a1234567
   cameraUser: admin
-  cameraPort: 37777
+  cameraPort: 8000
   videoServer: 127.0.0.1:8083
   #相机抓图延迟 毫秒,这个延迟是等待球机球机转动到位，然后拍照的
-  delayCaptureTime: 3500
+  delayCaptureTime: 0
   # 下载mp4延迟  海康的下载mp4需要2分钟
   # 利珀延迟10s就可
   # 单位毫秒
@@ -64,7 +64,7 @@ lightSource:
 # -----goods 货物
 # 扫码模式  0:此处不盘点  1：球机扫码   2：sick扫码枪  3:南北达RFID
 scanCodeMode:
-  tray: 1
+  tray: 2
   goods: 0
   goodsCodeTypes:
     - 14