普洱修改

web/src/main/java/com/zhehekeji/web/entity/CheckLog.java

@@ -35,6 +35,7 @@ public class CheckLog {
     private Integer count;
 
     private String wmsCategory;
+    private String wmsCategoryName;
 
     private Integer wmsCount;
 
@@ -58,6 +59,8 @@ public class CheckLog {
 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
 
     @TableField(exist=false)
     private String streetName;

web/src/main/java/com/zhehekeji/web/pojo/stock/RowColumnStatus.java

@@ -1,10 +1,12 @@
 package com.zhehekeji.web.pojo.stock;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NonNull;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -33,5 +35,11 @@ public class RowColumnStatus {
 
     private List<String> rowTabs;
 
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTimestamp;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTimestamp;
+
     private List<String> columnTabs;
 }

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

@@ -33,7 +33,7 @@ public class CheckLogService {
 
         PageHelper.startPage(search.getPageNum(), search.getPageSize());
         QueryWrapper<CheckLog> wrapper = new QueryWrapper<>();
-        wrapper.eq(!StringUtils.isEmpty(search.getLotnum()), "lotnum", search.getLotnum())
+        wrapper.like(!StringUtils.isEmpty(search.getLotnum()), "task_id", search.getLotnum())
                 .ge(search.getStartTimestamp() != null, "create_time", search.getStartTimestamp())
                 .le(search.getEndTimestamp() != null, "create_time", search.getEndTimestamp())
                 .eq(search.getLeftRight() != null && search.getLeftRight() > 0, "`direction`", search.getLeftRight())

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

@@ -713,6 +713,7 @@ public class PlcService {
         stock.setCategory(dataInfo.getTypeNum());
         stock.setCount(dataInfo.getQuantity());
         stock.setWmsCategoryName(dataInfo.getCategoryName());
+        checkLog.setWmsCategoryName(dataInfo.getCategoryName());
         stock.setTaskId((dataInfo.getTaskId()));
         //默认未盘点
         if (stock.getCategory().length() == 6) {
@@ -788,7 +789,6 @@ public class PlcService {
     }
 
 
-
     public void visualCalculationResults(TransmissionPojo transmissionPojo) {
 
         CheckLog checkLog = checkLogMapper.selectById(transmissionPojo.getCheckId());
@@ -925,13 +925,13 @@ public class PlcService {
             stock.setStatus(StockStatus.COUNT_ERROR.getStatus());
         }
         stock.setEndTime(LocalDateTime.now());
+        checkLog.setEndTime(stock.getEndTime());
         checkLogMapper.updateById(checkLog);
         stockMapper.updateById(stock);
         return checkLog.getStatus() > 2 ? 1 : 0;
     }
 
 
-
     public static String join(String[] array, String separator) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < array.length; i++) {
@@ -960,7 +960,6 @@ public class PlcService {
             ksecDataInfo.setLotnum(checkLog.getLotnum());
 
 
-
         }
 
         KsecInfo ksecInfo = new KsecInfo("KC", "E", ksecDataInfo);

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

@@ -66,7 +66,6 @@ public class StockService {
 //        Map<String, List<Stock>> shelveMap = stocks.stream().collect(Collectors.groupingBy(Stock::getShelveId));
 //        return shelveMap;
 //    }
-
     public List<Stock> list(Integer streetId) {
         Street street = streetService.streetById(streetId);
         if (street == null) {
@@ -112,7 +111,9 @@ public class StockService {
                 .select("status", "`row`", "`column`")
                 .eq("`street_id`", rowColumnStatus.getStreetId())
                 .eq("direction", rowColumnStatus.getDirection())
-                .eq("side",rowColumnStatus.getSide()));
+                .eq("side", rowColumnStatus.getSide())
+                .ge(rowColumnStatus.getStartTimestamp() != null, "export_Time", rowColumnStatus.getStartTimestamp())
+                .le(rowColumnStatus.getEndTimestamp() != null, "export_Time", rowColumnStatus.getEndTimestamp()));
         if (CollectionUtils.isEmpty(stocks)) {
             stockInit(rowColumnStatus.getRowStart(), rowColumnStatus.getRowEnd(), rowColumnStatus.getColumnStart(), rowColumnStatus.getColumnEnd(), null, stocks);
             checkStatus.setStocks(stocks);
@@ -239,7 +240,6 @@ public class StockService {
     }
 
 
-
     private Boolean isRowColumnInTab(Stock stock, String tab, Boolean isRow) {
         String[] strings = tab.split(" - ");
         Integer tabStart = Integer.valueOf(strings[0]);
@@ -348,6 +348,7 @@ public class StockService {
         }
         return stock;
     }
+
     String getName(Map<String, String> map, String category) {
         String name = category;
         if (category != null && !"".equals(category) && map.get(category) != null) {
@@ -385,6 +386,7 @@ public class StockService {
         checkLog(stock);
         return stock;
     }
+
     /**
      * 核对单子
      * 核对正确
@@ -465,6 +467,7 @@ public class StockService {
         }
         return stock;
     }
+
     @Resource
     CategoryMapper categoryMapper;