From 88030f5ae629fca9fe65a38e79adffecc5314b58 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Sun, 23 Feb 2025 14:41:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=BA=93=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E6=89=BE=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/wms/controller/StockController.java   | 36 ++++++++++++++++++-
 .../entity/dto/stock/StockQueryReuqest.java   | 16 +++++++++
 src/main/java/com/wms/entity/table/Task.java  |  2 +-
 src/main/resources/mapper/StockMapper.xml     |  1 +
 src/main/resources/mapper/TaskMapper.xml      |  2 +-
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java

diff --git a/src/main/java/com/wms/controller/StockController.java b/src/main/java/com/wms/controller/StockController.java
index 53c9c48..be4a877 100644
--- a/src/main/java/com/wms/controller/StockController.java
+++ b/src/main/java/com/wms/controller/StockController.java
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.wms.constants.enums.ResponseCode;
 import com.wms.entity.app.ResponseEntity;
+import com.wms.entity.dto.stock.StockQueryReuqest;
 import com.wms.entity.page.PageDomain;
 import com.wms.entity.page.TableRequest;
 import com.wms.entity.page.TableResponse;
@@ -21,9 +22,11 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -85,6 +88,38 @@ public class StockController extends BaseController {
         return JSON.toJSONString(tblResp);
     }
 
+
+    /**
+     * 根据库位号查询库存
+     */
+    @PostMapping("/getStockByLocation")
+    @ResponseBody
+    public String getStocksByLocation( @RequestBody StockQueryReuqest stockQueryReuqest){
+        logger.info("请求的ip地址：{}", HttpUtils.getIpAddr(servletRequest));
+        logger.info("接收到根据位置id查询库存请求：{}", JSON.toJSONString(stockQueryReuqest.getLocationId()));
+        // 创建响应信息
+        ResponseEntity rsp = new ResponseEntity();
+        if (StringUtils.isEmpty(stockQueryReuqest.getLocationId())) {
+            logger.error("查询的库位编号为空");
+            rsp.setCode(ResponseCode.ERROR.getCode());
+            rsp.setMessage("查询的库位编号为空");
+            return JSON.toJSONString(rsp);
+        }
+        Stock stock = new Stock();
+        stock.setLocationId(stockQueryReuqest.getLocationId());
+        List<Stock> queryStocks = stockService.selStocks(stock);
+        if(CollectionUtils.isEmpty(queryStocks)) {
+            logger.info("位置信息{},库存为空",stockQueryReuqest.getLocationId());
+            rsp.setCode(ResponseCode.ERROR.getCode());
+            rsp.setMessage("位置信息库存为空");
+            return JSON.toJSONString(rsp);
+        }
+        rsp.setCode(ResponseCode.OK.getCode());
+        rsp.setMessage("查询库存成功！");
+        rsp.setReturnData(queryStocks.get(0));
+        return JSON.toJSONString(rsp);
+    }
+
     /**
      * 查找所有库存---按物料汇总
      */
@@ -184,7 +219,6 @@ public class StockController extends BaseController {
             Stock tempStock = new Stock();
             tempStock.setStockId(WmsUtils.generateId("ST"));
 
-
         } catch (Exception e) {
             // 回滚事务
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java b/src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java
new file mode 100644
index 0000000..7ed8c6f
--- /dev/null
+++ b/src/main/java/com/wms/entity/dto/stock/StockQueryReuqest.java
@@ -0,0 +1,16 @@
+package com.wms.entity.dto.stock;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Classname StockQueryReuqest
+ * @Date 2025-02-23 0:00
+ * @Created by luyifan
+ */
+@Data
+public class StockQueryReuqest implements Serializable {
+    private   String locationId;
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/wms/entity/table/Task.java b/src/main/java/com/wms/entity/table/Task.java
index b39e7e6..dfbc0aa 100644
--- a/src/main/java/com/wms/entity/table/Task.java
+++ b/src/main/java/com/wms/entity/table/Task.java
@@ -33,7 +33,7 @@ public class Task extends BaseEntity {
 
 
     /**
-     * 任务类型
+     * 任务类型  （1：入库；2：出库；9：移库）
      */
     @ExcelExport("任务类型")
     private Integer taskType;
diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 2b00a8c..e9bcfaf 100644
--- a/src/main/resources/mapper/StockMapper.xml
+++ b/src/main/resources/mapper/StockMapper.xml
@@ -42,6 +42,7 @@
         <where>
             <if test="query != null and query != ''"> vehicle_id = #{query} or goods_id like concat('%', #{query}, '%') or goods_name like concat('%', #{query}, '%') or batch_no = #{query}</if>
         </where>
+        order by create_time
     </select>
 
     <select id="selStocksByGoodsId" parameterType="Stock" resultMap="StockMap">
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 8e6d814..195e679 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -60,7 +60,7 @@
             <if test="kateTaskId != null and kateTaskId != ''"> and kate_task_id = #{kateTaskId}</if>
             <if test="remark1 != null and remark1 != ''"> and remark1 = #{remark1}</if>
         </where>
-        order by task_priority desc, task_status desc, create_time desc
+        order by create_time desc, task_priority desc, task_status desc
     </select>
 
     <select id="selTasksByTaskId" parameterType="Task" resultMap="TaskMap">