1.全部盘点

2.根据巷道区分历史数据

web/src/main/java/com/zhehekeji/web/controller/StockController.java

@@ -23,7 +23,6 @@ import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.Map;
 
 @Api(value = "Stock", tags = "库存管理")
 @RestController
@@ -140,7 +139,14 @@ public class StockController {
         validatorUtil.validate(checkByMan);
         return Result.success(stockService.checkByMan(checkByMan));
     }
+    //allStockChack 全部盘点
 
+    @ApiOperation(value = "全部盘点")
+    @RequestMapping(value = "/allStockCheck", method = RequestMethod.POST)
+    public Result allStockCheck() {
+        stockService.allStockCheck();
+        return Result.success();
+    }
     public static void main(String[] args) {
         String s = "4";
         String ss = String.format("%03d", 4);

web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java

@@ -12,6 +12,8 @@ public class OrderSearch {
     @NotEmpty(message = "订单号不能为空")
     private String orderNum;
 
+    private Long streetId;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTimestamp;
 

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

@@ -411,6 +411,13 @@ public class StockService {
         return stock;
     }
 
+    public void allStockCheck() {
+        Stock stock = new Stock();
+        stock.setStatus(3);
+        stockMapper.update(stock,new QueryWrapper<Stock>().eq("status","0"));
+
+    }
+
 //    public void init(String shelveId, Integer row, Integer column){
 //        Map<String,Object> map = new HashMap<>();
 //        map.put("shelve_id",shelveId);

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

@@ -7,7 +7,7 @@ spring:
     maxWait: 60000
     minEvictableIdleTimeMillis: 300000
     minIdle: 15
-    password: Leaper@123
+    password: root
     poolPreparedStatements: true
     testOnBorrow: true
     testOnReturn: false

web/src/main/resources/mapper/OrderMapper.xml

@@ -12,6 +12,9 @@
             <if test="req.startTimestamp != null and req.endTimestamp != null">
                 and t.start_time >= #{req.startTimestamp} and t.start_time &lt;= #{req.endTimestamp}
             </if>
+            <if test="req.streetId != null and req.streetId != ''">
+                and t.street_id = #{req.streetId}
+            </if>
         </where>
         order by t.id desc
     </select>