From dffb14daa7aaac6a0d18b86f4fae63997d9c7df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Tue, 18 Apr 2023 17:37:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=A8=E9=83=A8=E7=9B=98=E7=82=B9=202.?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=B7=E9=81=93=E5=8C=BA=E5=88=86=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/controller/StockController.java     | 8 +++++++-
 web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java | 2 ++
 .../main/java/com/zhehekeji/web/service/StockService.java | 7 +++++++
 web/src/main/resources/application-test.yml               | 2 +-
 web/src/main/resources/mapper/OrderMapper.xml             | 3 +++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java
index 99fb632..9b6058d 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java
+++ b/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);
diff --git a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java b/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java
index c70d7e3..1b1008a 100644
--- a/web/src/main/java/com/zhehekeji/web/pojo/OrderSearch.java
+++ b/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;
 
diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java
index e8f8924..f68a24d 100644
--- a/web/src/main/java/com/zhehekeji/web/service/StockService.java
+++ b/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);
diff --git a/web/src/main/resources/application-test.yml b/web/src/main/resources/application-test.yml
index 90415ee..d573649 100644
--- a/web/src/main/resources/application-test.yml
+++ b/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
diff --git a/web/src/main/resources/mapper/OrderMapper.xml b/web/src/main/resources/mapper/OrderMapper.xml
index bd556c7..bbb4291 100644
--- a/web/src/main/resources/mapper/OrderMapper.xml
+++ b/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>