From 1a3041f48095902df94f132fc99458ddb5a4905a Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Wed, 19 Jun 2024 11:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jnpf/service/impl/InventoryServiceImpl.java     | 9 +++++++++
 .../main/java/jnpf/controller/InventoryController.java   | 4 ++--
 .../java/jnpf/model/inventory/InventoryPagination.java   | 2 ++
 .../jnpf-web/src/views/scm/inventory/index.vue           | 8 ++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/InventoryServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/InventoryServiceImpl.java
index e095ea6d..769ab4f4 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/InventoryServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/InventoryServiceImpl.java
@@ -146,6 +146,15 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     }
     }
         if(isPc){
+
+            if(ObjectUtil.isNotEmpty(inventoryPagination.getStorageAreaName())){
+                inventoryNum++;
+
+                String value = String.valueOf(inventoryPagination.getStorageAreaName());
+                inventoryQueryWrapper.like("g.CARGO_NAME",value);
+
+            }
+
             if(ObjectUtil.isNotEmpty(inventoryPagination.getName())){
             inventoryNum++;
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/InventoryController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/InventoryController.java
index f12b86ac..d2b8e296 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/InventoryController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/InventoryController.java
@@ -217,7 +217,7 @@ public class InventoryController {
                     entitys.add(new ExcelExportEntity("商品品牌" ,"brandId"));
                     break;
                     case "inventoryUnitId" :
-                    entitys.add(new ExcelExportEntity("库存单位" ,"inventoryUnitId"));
+                    entitys.add(new ExcelExportEntity("库存单位" ,"inventoryUnitName"));
                     break;
                     case "batchNumber" :
                     entitys.add(new ExcelExportEntity("批次号" ,"batchNumber"));
@@ -235,7 +235,7 @@ public class InventoryController {
                     entitys.add(new ExcelExportEntity("仓库" ,"warehouseId"));
                     break;
                     case "storageAreaId" :
-                    entitys.add(new ExcelExportEntity("货区" ,"storageAreaId"));
+                    entitys.add(new ExcelExportEntity("货区" ,"storageAreaName"));
                     break;
                     default:
                     break;
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/inventory/InventoryPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/inventory/InventoryPagination.java
index 1ccc47fa..c37c17e6 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/inventory/InventoryPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/inventory/InventoryPagination.java
@@ -40,4 +40,6 @@ public class InventoryPagination extends Pagination {
     private String searchDateType;
     /** 仓库 */
     private String warehouseName;
+    /** 库区 */
+    private String storageAreaName;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
index b12e73ca..a92524fa 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/index.vue
@@ -13,6 +13,12 @@
               <el-input v-model="query.warehouseName" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="库区">
+              <el-input v-model="query.storageAreaName" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="批次号">
               <el-input v-model="query.batchNumber" placeholder="请输入" clearable> </el-input>
@@ -185,11 +191,13 @@ export default {
       superQueryJson,
       uploadBoxVisible: false,
       detailVisible: false,
+
       query: {
         name: undefined,
         productTypeId: undefined,
         batchNumber: undefined,
         searchDateType: '1',
+        storageAreaName: undefined,
       },
       treeProps: {
         children: 'children',