前端增加信息，后端增加品规失败和个数失败

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;//点位文件路径
 

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;
 }

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;
 

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());
 
-        List<EmptyCheck>stockList = new ArrayList<>();
+        List<EmptyCheck> stockList = new ArrayList<>();
         //默认全部盘点正确
         Map<String,Integer> 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;
     }
 

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;

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

@@ -108,7 +108,11 @@ public class StockService {
         }
         Map<String,Integer> columnTabCorrectCount = new LinkedHashMap<>();
         Map<String,Integer> rowTabCorrectCount = new LinkedHashMap<>();
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().select("status","`row`","`column`").eq("`street_id`",rowColumnStatus.getStreetId()).eq("direction",rowColumnStatus.getDirection()).eq("side",rowColumnStatus.getSide()));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>()
+                .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);

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