From d3d6287a3222b9c85a56e4c55c35350c4233c7db Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:41 +0800
Subject: [PATCH] 库存管理简练

---
 src/main/java/com/ruoyi/inventory/domain/StockIn.java                          |    6 
 src/main/java/com/ruoyi/inventory/service/impl/StockInServiceImpl.java         |   45 ++++
 src/main/resources/mapper/inventory/StockProductMapper.xml                     |   24 -
 src/main/java/com/ruoyi/project/system/controller/SysPostController.java       |    3 
 src/main/resources/mapper/inventory/StockManagementMapper.xml                  |   30 --
 src/main/java/com/ruoyi/inventory/mapper/StockManagementMapper.java            |    9 
 src/main/java/com/ruoyi/inventory/service/impl/StockOutServiceImpl.java        |   45 ++++
 src/main/resources/mapper/inventory/StockOutMapper.xml                         |   35 --
 src/main/java/com/ruoyi/inventory/mapper/StockOutMapper.java                   |    8 
 src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java |   45 ++++
 src/main/java/com/ruoyi/inventory/mapper/StockInMapper.java                    |   10 
 src/main/java/com/ruoyi/inventory/service/StockManagementService.java          |   12 +
 src/main/java/com/ruoyi/inventory/controller/StockInController.java            |   72 +++++++
 src/main/java/com/ruoyi/inventory/service/StockInService.java                  |   21 ++
 src/main/resources/mapper/inventory/StockInMapper.xml                          |   48 ++--
 src/main/java/com/ruoyi/inventory/mapper/StockProductMapper.java               |    9 
 src/main/java/com/ruoyi/inventory/service/StockOutService.java                 |   12 +
 src/main/java/com/ruoyi/inventory/controller/StockManagementController.java    |   54 +++++
 src/main/java/com/ruoyi/inventory/controller/StockOutController.java           |   57 +++++
 19 files changed, 432 insertions(+), 113 deletions(-)

diff --git a/src/main/java/com/ruoyi/inventory/controller/StockInController.java b/src/main/java/com/ruoyi/inventory/controller/StockInController.java
new file mode 100644
index 0000000..879a0f4
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/controller/StockInController.java
@@ -0,0 +1,72 @@
+package com.ruoyi.inventory.controller;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.inventory.mapper.StockManagementMapper;
+import com.ruoyi.inventory.mapper.StockProductMapper;
+import com.ruoyi.inventory.service.StockInService;
+import com.ruoyi.inventory.domain.StockIn;
+import com.ruoyi.project.system.domain.SysPost;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@RequestMapping("/stockin")
+public class StockInController extends BaseController {
+    @Autowired
+    private StockInService stockInService;
+    @Autowired
+    private StockManagementMapper stockManagementMapper;
+    @PostMapping("/add")// 鏂板鍏ュ簱璁板綍
+    public AjaxResult addStockIn(@RequestBody StockIn stockIn) {
+        int i = stockInService.addStockIn(stockIn);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @GetMapping("/list")// 鍒楀嚭鎵�鏈夊叆搴撹褰�
+    public AjaxResult listStockIns() {
+        List<StockIn> stockIns = stockInService.listStockIns();
+        return success(stockIns);
+    }
+    @GetMapping("/{id}")// 鏍规嵁ID鑾峰彇鍏ュ簱璁板綍
+    public AjaxResult getStockInById(@PathVariable Long id) {
+        StockIn stockIn = stockInService.getStockInById(id);
+        return success(stockIn);
+    }
+    @PutMapping("/update")// 鏇存柊鍏ュ簱璁板綍
+    public AjaxResult updateStockIn(@RequestBody StockIn stockIn) {
+        int i = stockInService.updateStockIn(stockIn);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @DeleteMapping("/delete/{id}")// 鍒犻櫎鍏ュ簱璁板綍
+    public AjaxResult deleteStockIn(@PathVariable Long id) {
+        int i = stockInService.deleteStockIn(id);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+//    @Log(title = "宀椾綅绠$悊", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('system:post:export')")
+    @GetMapping("/export")// 瀵煎嚭鍏ュ簱鏁版嵁
+    public AjaxResult exportStockInData() {
+        List<StockIn> stockIns = stockInService.listStockIns();
+        ExcelUtil<StockIn> util = new ExcelUtil<StockIn>(StockIn.class);
+        util.exportExcel(stockIns, "搴撳瓨鍏ュ簱淇℃伅");
+        return success();
+    }
+
+
+}
diff --git a/src/main/java/com/ruoyi/inventory/controller/StockManagementController.java b/src/main/java/com/ruoyi/inventory/controller/StockManagementController.java
new file mode 100644
index 0000000..370f50b
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/controller/StockManagementController.java
@@ -0,0 +1,54 @@
+package com.ruoyi.inventory.controller;
+
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.inventory.service.StockManagementService;
+import inventory.domain.StockManagement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.ruoyi.framework.web.domain.AjaxResult.error;
+import static com.ruoyi.framework.web.domain.AjaxResult.success;
+
+@RestController
+@RequestMapping("/stockmanagement")
+public class StockManagementController {
+    @Autowired
+    private StockManagementService stockManagementService;
+    @RequestMapping("/list")// 鍒楀嚭鎵�鏈夊嚭搴撹褰�
+    public AjaxResult listStockOuts() {
+        List<StockManagement> stockManagements = stockManagementService.getStockManagements();
+        return success(stockManagements);
+    }
+    @GetMapping("/{id}")// 鏍规嵁ID鑾峰彇鍑哄簱璁板綍
+    public AjaxResult getStockOutById(@PathVariable Long id) {
+        StockManagement stockManagement = stockManagementService.getStockManagementById(id);
+        return success(stockManagement);
+    }
+    @PostMapping("add")// 鏂板鍑哄簱璁板綍
+    public AjaxResult addStockOut(@RequestBody StockManagement stockManagement) {
+        int i = stockManagementService.addStockManagement(stockManagement);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @PutMapping("/update")// 鏇存柊鍑哄簱璁板綍
+    public AjaxResult updateStockOut(@RequestBody StockManagement stockManagement) {
+        int i = stockManagementService.updateStockManagement(stockManagement);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @DeleteMapping("/delete/{id}")// 鍒犻櫎鍑哄簱璁板綍
+    public AjaxResult deleteStockOut(@PathVariable Long id) {
+        int i = stockManagementService.deleteStockManagement(id);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/inventory/controller/StockOutController.java b/src/main/java/com/ruoyi/inventory/controller/StockOutController.java
new file mode 100644
index 0000000..a301065
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/controller/StockOutController.java
@@ -0,0 +1,57 @@
+package com.ruoyi.inventory.controller;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.inventory.domain.StockIn;
+import com.ruoyi.inventory.mapper.StockManagementMapper;
+import com.ruoyi.inventory.mapper.StockProductMapper;
+import com.ruoyi.inventory.service.StockOutService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import inventory.domain.StockOut;
+
+@RestController
+@RequestMapping("/stockout")
+public class StockOutController extends BaseController {
+    @Autowired
+    private StockOutService stockOutService;
+    @Autowired
+    private StockManagementMapper stockManagementMapper;
+
+    @RequestMapping("/add")
+    public AjaxResult addStockOut(StockOut stockOut) {
+        int i = stockOutService.addStockOut(stockOut);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @RequestMapping("/list")
+    public AjaxResult listStockOuts() {
+        List<StockOut> stockOuts = stockOutService.getStockOuts();
+        return success(stockOuts);
+    }
+    @RequestMapping("/{id}")
+    public AjaxResult getStockOutById(@PathVariable Long id) {
+        StockOut stockOut = stockOutService.getStockOutById(id);
+        return success(stockOut);
+    }
+    @RequestMapping("/update")
+    public AjaxResult updateStockOut(@RequestBody StockOut stockOut) {
+        int i = stockOutService.updateStockOut(stockOut);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+    @RequestMapping("/delete/{id}")
+    public AjaxResult deleteStockOut(Long id) {
+        int i = stockOutService.deleteStockOut(id);
+        if(i>0){
+            return success();
+        }
+        return error();
+    }
+}
diff --git a/src/main/java/com/ruoyi/inventory/domain/StockIn.java b/src/main/java/com/ruoyi/inventory/domain/StockIn.java
index 55d18cd..b24edbd 100644
--- a/src/main/java/com/ruoyi/inventory/domain/StockIn.java
+++ b/src/main/java/com/ruoyi/inventory/domain/StockIn.java
@@ -1,8 +1,11 @@
-package inventory.domain;
+package com.ruoyi.inventory.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import inventory.domain.StockProduct;
+
 import lombok.Data;
 
 /**
@@ -67,4 +70,5 @@
     private String inboundPerson;
 
     private static final long serialVersionUID = 1L;
+    private List<StockProduct> stockProducts;
 }
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/inventory/mapper/StockInMapper.java b/src/main/java/com/ruoyi/inventory/mapper/StockInMapper.java
index 06ffe67..f50b02d 100644
--- a/src/main/java/com/ruoyi/inventory/mapper/StockInMapper.java
+++ b/src/main/java/com/ruoyi/inventory/mapper/StockInMapper.java
@@ -1,6 +1,8 @@
-package inventory.mapper;
+package com.ruoyi.inventory.mapper;
 
-import inventory.domain.StockIn;
+import com.ruoyi.inventory.domain.StockIn;
+
+import java.util.List;
 
 /**
 * @author 86151
@@ -12,14 +14,12 @@
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(StockIn record);
-
     int insertSelective(StockIn record);
 
     StockIn selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(StockIn record);
 
-    int updateByPrimaryKey(StockIn record);
+    List<StockIn> selectList();
 
 }
diff --git a/src/main/java/com/ruoyi/inventory/mapper/StockManagementMapper.java b/src/main/java/com/ruoyi/inventory/mapper/StockManagementMapper.java
index 32a7f5c..026c539 100644
--- a/src/main/java/com/ruoyi/inventory/mapper/StockManagementMapper.java
+++ b/src/main/java/com/ruoyi/inventory/mapper/StockManagementMapper.java
@@ -1,6 +1,8 @@
-package inventory.mapper;
+package com.ruoyi.inventory.mapper;
 
 import inventory.domain.StockManagement;
+
+import java.util.List;
 
 /**
 * @author 86151
@@ -9,10 +11,8 @@
 * @Entity inventory.domain.StockManagement
 */
 public interface StockManagementMapper {
-
+    List<StockManagement> selectAll();
     int deleteByPrimaryKey(Long id);
-
-    int insert(StockManagement record);
 
     int insertSelective(StockManagement record);
 
@@ -20,6 +20,5 @@
 
     int updateByPrimaryKeySelective(StockManagement record);
 
-    int updateByPrimaryKey(StockManagement record);
 
 }
diff --git a/src/main/java/com/ruoyi/inventory/mapper/StockOutMapper.java b/src/main/java/com/ruoyi/inventory/mapper/StockOutMapper.java
index e6dff2e..31cf809 100644
--- a/src/main/java/com/ruoyi/inventory/mapper/StockOutMapper.java
+++ b/src/main/java/com/ruoyi/inventory/mapper/StockOutMapper.java
@@ -1,6 +1,8 @@
-package inventory.mapper;
+package com.ruoyi.inventory.mapper;
 
 import inventory.domain.StockOut;
+
+import java.util.List;
 
 /**
 * @author 86151
@@ -12,14 +14,12 @@
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(StockOut record);
-
+    List<StockOut> selectAll();
     int insertSelective(StockOut record);
 
     StockOut selectByPrimaryKey(Long id);
 
     int updateByPrimaryKeySelective(StockOut record);
 
-    int updateByPrimaryKey(StockOut record);
 
 }
diff --git a/src/main/java/com/ruoyi/inventory/mapper/StockProductMapper.java b/src/main/java/com/ruoyi/inventory/mapper/StockProductMapper.java
index 3d7d20c..bd051fc 100644
--- a/src/main/java/com/ruoyi/inventory/mapper/StockProductMapper.java
+++ b/src/main/java/com/ruoyi/inventory/mapper/StockProductMapper.java
@@ -1,6 +1,8 @@
-package inventory.mapper;
+package com.ruoyi.inventory.mapper;
 
 import inventory.domain.StockProduct;
+
+import java.util.List;
 
 /**
 * @author 86151
@@ -9,10 +11,8 @@
 * @Entity inventory.domain.StockProduct
 */
 public interface StockProductMapper {
-
+    List<StockProduct> selectList();
     int deleteByPrimaryKey(Long id);
-
-    int insert(StockProduct record);
 
     int insertSelective(StockProduct record);
 
@@ -20,6 +20,5 @@
 
     int updateByPrimaryKeySelective(StockProduct record);
 
-    int updateByPrimaryKey(StockProduct record);
 
 }
diff --git a/src/main/java/com/ruoyi/inventory/service/StockInService.java b/src/main/java/com/ruoyi/inventory/service/StockInService.java
new file mode 100644
index 0000000..d6ba13e
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/StockInService.java
@@ -0,0 +1,21 @@
+package com.ruoyi.inventory.service;
+
+import com.ruoyi.inventory.domain.StockIn;
+
+
+import java.util.List;
+
+
+public interface StockInService {
+    int addStockIn(StockIn stockIn);
+
+    List<StockIn> listStockIns();
+
+    StockIn getStockInById(Long id);
+
+    int updateStockIn(StockIn stockIn);
+
+    int deleteStockIn(Long id);
+
+
+}
diff --git a/src/main/java/com/ruoyi/inventory/service/StockManagementService.java b/src/main/java/com/ruoyi/inventory/service/StockManagementService.java
new file mode 100644
index 0000000..ac014c9
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/StockManagementService.java
@@ -0,0 +1,12 @@
+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import inventory.domain.StockManagement;
+
+public interface StockManagementService {
+    List<StockManagement> getStockManagements();
+    StockManagement getStockManagementById(Long id);
+    int addStockManagement(StockManagement stockManagement);
+    int updateStockManagement(StockManagement stockManagement);
+    int deleteStockManagement(Long id);
+}
diff --git a/src/main/java/com/ruoyi/inventory/service/StockOutService.java b/src/main/java/com/ruoyi/inventory/service/StockOutService.java
new file mode 100644
index 0000000..f392a2c
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/StockOutService.java
@@ -0,0 +1,12 @@
+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import inventory.domain.StockOut;
+
+public interface StockOutService {
+    List<StockOut> getStockOuts();
+    StockOut getStockOutById(Long id);
+    int addStockOut(StockOut stockOut);
+    int updateStockOut(StockOut stockOut);
+    int deleteStockOut(Long id);
+}
diff --git a/src/main/java/com/ruoyi/inventory/service/impl/StockInServiceImpl.java b/src/main/java/com/ruoyi/inventory/service/impl/StockInServiceImpl.java
new file mode 100644
index 0000000..a0b77c1
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/impl/StockInServiceImpl.java
@@ -0,0 +1,45 @@
+package com.ruoyi.inventory.service.impl;
+
+import com.ruoyi.inventory.domain.StockIn;
+import com.ruoyi.inventory.mapper.StockInMapper;
+import com.ruoyi.inventory.service.StockInService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class StockInServiceImpl implements StockInService {
+    @Autowired
+    private StockInMapper stockInMapper;
+
+    @Override//娣诲姞搴撳瓨鍏ュ簱淇℃伅
+    public int addStockIn(StockIn stockIn) {
+        int i = stockInMapper.insertSelective(stockIn);
+        return i;
+        }
+
+    @Override//鍒楀嚭鎵�鏈夊簱瀛樺叆搴撲俊鎭�
+    public List<StockIn> listStockIns() {
+        List<StockIn> stockIns = stockInMapper.selectList();
+        return stockIns;
+    }
+
+    @Override//鏍规嵁id鑾峰彇搴撳瓨鍏ュ簱淇℃伅
+    public StockIn getStockInById(Long id) {
+        StockIn stockIn = stockInMapper.selectByPrimaryKey(id);
+        return stockIn;
+    }
+
+    @Override//鏇存柊搴撳瓨鍏ュ簱淇℃伅
+    public int updateStockIn(StockIn stockIn) {
+        int i = stockInMapper.updateByPrimaryKeySelective(stockIn);
+        return i;
+    }
+
+    @Override//鍒犻櫎搴撳瓨鍏ュ簱淇℃伅
+    public int deleteStockIn(Long id) {
+        int i = stockInMapper.deleteByPrimaryKey(id);
+        return i;
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java b/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java
new file mode 100644
index 0000000..6e6c64e
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/impl/StockManagementServiceImpl.java
@@ -0,0 +1,45 @@
+package com.ruoyi.inventory.service.impl;
+
+import com.ruoyi.inventory.mapper.StockManagementMapper;
+import com.ruoyi.inventory.service.StockManagementService;
+import inventory.domain.StockManagement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StockManagementServiceImpl implements StockManagementService {
+    @Autowired
+    private StockManagementMapper stockManagementMapper;
+
+    @Override
+    public List<StockManagement> getStockManagements() {
+        List<StockManagement> stockManagements = stockManagementMapper.selectAll();
+        return stockManagements;
+    }
+
+    @Override
+    public StockManagement getStockManagementById(Long id) {
+        StockManagement stockManagement = stockManagementMapper.selectByPrimaryKey(id);
+        return stockManagement;
+    }
+
+    @Override
+    public int addStockManagement(StockManagement stockManagement) {
+        int i = stockManagementMapper.insertSelective(stockManagement);
+        return i;
+    }
+
+    @Override
+    public int updateStockManagement(StockManagement stockManagement) {
+        int i = stockManagementMapper.updateByPrimaryKeySelective(stockManagement);
+        return i;
+    }
+
+    @Override
+    public int deleteStockManagement(Long id) {
+        int i = stockManagementMapper.deleteByPrimaryKey(id);
+        return i;
+    }
+}
diff --git a/src/main/java/com/ruoyi/inventory/service/impl/StockOutServiceImpl.java b/src/main/java/com/ruoyi/inventory/service/impl/StockOutServiceImpl.java
new file mode 100644
index 0000000..37bcfde
--- /dev/null
+++ b/src/main/java/com/ruoyi/inventory/service/impl/StockOutServiceImpl.java
@@ -0,0 +1,45 @@
+package com.ruoyi.inventory.service.impl;
+
+import com.ruoyi.inventory.mapper.StockOutMapper;
+import com.ruoyi.inventory.service.StockOutService;
+import inventory.domain.StockOut;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StockOutServiceImpl implements StockOutService {
+    @Autowired
+    private StockOutMapper stockOutMapper;
+    @Override
+    public List<StockOut> getStockOuts() {
+        List<StockOut> stockOuts = stockOutMapper.selectAll();
+        return stockOuts;
+    }
+
+    @Override
+    public StockOut getStockOutById(Long id) {
+        StockOut stockOut = stockOutMapper.selectByPrimaryKey(id);
+        return stockOut;
+    }
+
+    @Override
+    public int addStockOut(StockOut stockOut) {
+        int i = stockOutMapper.insertSelective(stockOut);
+        return i;
+    }
+
+    @Override
+    public int updateStockOut(StockOut stockOut) {
+        int i = stockOutMapper.updateByPrimaryKeySelective(stockOut);
+        return i;
+    }
+
+    @Override
+    public int deleteStockOut(Long id) {
+        int i = stockOutMapper.deleteByPrimaryKey(id);
+        return i;
+    }
+}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index a4b14ab..a49692c 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -45,6 +45,9 @@
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
     }
+    /**
+     * 瀵煎嚭宀椾綅鍒楄〃
+     */
     
     @Log(title = "宀椾綅绠$悊", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
diff --git a/src/main/resources/mapper/StockInMapper.xml b/src/main/resources/mapper/inventory/StockInMapper.xml
similarity index 76%
rename from src/main/resources/mapper/StockInMapper.xml
rename to src/main/resources/mapper/inventory/StockInMapper.xml
index 3aa07c7..5f161e7 100644
--- a/src/main/resources/mapper/StockInMapper.xml
+++ b/src/main/resources/mapper/inventory/StockInMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="inventory.mapper.StockInMapper">
+<mapper namespace="com.ruoyi.inventory.mapper.StockInMapper">
 
-    <resultMap id="BaseResultMap" type="inventory.domain.StockIn">
+    <resultMap id="BaseResultMap" type="com.ruoyi.inventory.domain.StockIn">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="productId" column="product_id" jdbcType="INTEGER"/>
             <result property="inboundTime" column="inbound_time" jdbcType="TIMESTAMP"/>
@@ -16,6 +16,10 @@
             <result property="taxRate" column="tax_rate" jdbcType="DECIMAL"/>
             <result property="taxExclusiveTotal" column="tax_exclusive_total" jdbcType="DECIMAL"/>
             <result property="inboundPerson" column="inbound_person" jdbcType="VARCHAR"/>
+            <collection property="stockProducts" ofType="com.ruoyi.inventory.domain.StockProduct"
+                        select="com.ruoyi.inventory.mapper.StockProductMapper.selectByPrimaryKey" column="productId">
+                <id property="id" column="productId" jdbcType="INTEGER"/>
+            </collection>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -31,22 +35,23 @@
         from stock_in
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectList" resultType="com.ruoyi.inventory.domain.StockIn">
+        select
+        <include refid="Base_Column_List" />
+        from stock_in
+    </select>
+    <select id="selectListByPage" resultType="com.ruoyi.inventory.domain.StockIn">
+        select
+        <include refid="Base_Column_List" />
+        from stock_in
+        limit #{pageNum},#{pageSize}
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from stock_in
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockIn" useGeneratedKeys="true">
-        insert into stock_in
-        ( id,product_id,inbound_time
-        ,inbound_batch,supplier_name,inbound_quantity
-        ,tax_inclusive_price,tax_inclusive_total,tax_rate
-        ,tax_exclusive_total,inbound_person)
-        values (#{id,jdbcType=INTEGER},#{productId,jdbcType=INTEGER},#{inboundTime,jdbcType=TIMESTAMP}
-        ,#{inboundBatch,jdbcType=VARCHAR},#{supplierName,jdbcType=VARCHAR},#{inboundQuantity,jdbcType=INTEGER}
-        ,#{taxInclusivePrice,jdbcType=DECIMAL},#{taxInclusiveTotal,jdbcType=DECIMAL},#{taxRate,jdbcType=DECIMAL}
-        ,#{taxExclusiveTotal,jdbcType=DECIMAL},#{inboundPerson,jdbcType=VARCHAR})
-    </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockIn" useGeneratedKeys="true">
         insert into stock_in
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -76,6 +81,7 @@
                 <if test="inboundPerson != null">#{inboundPerson,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
+
     <update id="updateByPrimaryKeySelective" parameterType="inventory.domain.StockIn">
         update stock_in
         <set>
@@ -112,19 +118,5 @@
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="inventory.domain.StockIn">
-        update stock_in
-        set 
-            product_id =  #{productId,jdbcType=INTEGER},
-            inbound_time =  #{inboundTime,jdbcType=TIMESTAMP},
-            inbound_batch =  #{inboundBatch,jdbcType=VARCHAR},
-            supplier_name =  #{supplierName,jdbcType=VARCHAR},
-            inbound_quantity =  #{inboundQuantity,jdbcType=INTEGER},
-            tax_inclusive_price =  #{taxInclusivePrice,jdbcType=DECIMAL},
-            tax_inclusive_total =  #{taxInclusiveTotal,jdbcType=DECIMAL},
-            tax_rate =  #{taxRate,jdbcType=DECIMAL},
-            tax_exclusive_total =  #{taxExclusiveTotal,jdbcType=DECIMAL},
-            inbound_person =  #{inboundPerson,jdbcType=VARCHAR}
-        where   id = #{id,jdbcType=INTEGER} 
-    </update>
+
 </mapper>
diff --git a/src/main/resources/mapper/StockManagementMapper.xml b/src/main/resources/mapper/inventory/StockManagementMapper.xml
similarity index 76%
rename from src/main/resources/mapper/StockManagementMapper.xml
rename to src/main/resources/mapper/inventory/StockManagementMapper.xml
index eed2424..93ca524 100644
--- a/src/main/resources/mapper/StockManagementMapper.xml
+++ b/src/main/resources/mapper/inventory/StockManagementMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="inventory.mapper.StockManagementMapper">
+<mapper namespace="com.ruoyi.inventory.mapper.StockManagementMapper">
 
     <resultMap id="BaseResultMap" type="inventory.domain.StockManagement">
             <id property="id" column="id" jdbcType="INTEGER"/>
@@ -27,20 +27,17 @@
         from stock_management
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectAll" resultType="inventory.domain.StockManagement">
+        select
+        <include refid="Base_Column_List" />
+        from stock_management
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from stock_management
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockManagement" useGeneratedKeys="true">
-        insert into stock_management
-        ( id,product_id,stock_quantity
-        ,tax_inclusive_price,tax_inclusive_total,tax_rate
-        ,tax_exclusive_total,inbound_person)
-        values (#{id,jdbcType=INTEGER},#{productId,jdbcType=INTEGER},#{stockQuantity,jdbcType=INTEGER}
-        ,#{taxInclusivePrice,jdbcType=DECIMAL},#{taxInclusiveTotal,jdbcType=DECIMAL},#{taxRate,jdbcType=DECIMAL}
-        ,#{taxExclusiveTotal,jdbcType=DECIMAL},#{inboundPerson,jdbcType=VARCHAR})
-    </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockManagement" useGeneratedKeys="true">
         insert into stock_management
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -91,16 +88,5 @@
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="inventory.domain.StockManagement">
-        update stock_management
-        set 
-            product_id =  #{productId,jdbcType=INTEGER},
-            stock_quantity =  #{stockQuantity,jdbcType=INTEGER},
-            tax_inclusive_price =  #{taxInclusivePrice,jdbcType=DECIMAL},
-            tax_inclusive_total =  #{taxInclusiveTotal,jdbcType=DECIMAL},
-            tax_rate =  #{taxRate,jdbcType=DECIMAL},
-            tax_exclusive_total =  #{taxExclusiveTotal,jdbcType=DECIMAL},
-            inbound_person =  #{inboundPerson,jdbcType=VARCHAR}
-        where   id = #{id,jdbcType=INTEGER} 
-    </update>
+
 </mapper>
diff --git a/src/main/resources/mapper/StockOutMapper.xml b/src/main/resources/mapper/inventory/StockOutMapper.xml
similarity index 76%
rename from src/main/resources/mapper/StockOutMapper.xml
rename to src/main/resources/mapper/inventory/StockOutMapper.xml
index f5111c5..7215c83 100644
--- a/src/main/resources/mapper/StockOutMapper.xml
+++ b/src/main/resources/mapper/inventory/StockOutMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="inventory.mapper.StockOutMapper">
+<mapper namespace="com.ruoyi.inventory.mapper.StockOutMapper">
 
     <resultMap id="BaseResultMap" type="inventory.domain.StockOut">
             <id property="id" column="id" jdbcType="INTEGER"/>
@@ -31,22 +31,17 @@
         from stock_out
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectAll" resultType="inventory.domain.StockOut">
+        select
+        <include refid="Base_Column_List" />
+        from stock_out
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from stock_out
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockOut" useGeneratedKeys="true">
-        insert into stock_out
-        ( id,product_id,inbound_time
-        ,inbound_batch,supplier_name,inbound_quantity
-        ,tax_inclusive_price,tax_inclusive_total,tax_rate
-        ,tax_exclusive_total,inbound_person)
-        values (#{id,jdbcType=INTEGER},#{productId,jdbcType=INTEGER},#{inboundTime,jdbcType=TIMESTAMP}
-        ,#{inboundBatch,jdbcType=VARCHAR},#{supplierName,jdbcType=VARCHAR},#{inboundQuantity,jdbcType=INTEGER}
-        ,#{taxInclusivePrice,jdbcType=DECIMAL},#{taxInclusiveTotal,jdbcType=DECIMAL},#{taxRate,jdbcType=DECIMAL}
-        ,#{taxExclusiveTotal,jdbcType=DECIMAL},#{inboundPerson,jdbcType=VARCHAR})
-    </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockOut" useGeneratedKeys="true">
         insert into stock_out
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -112,19 +107,5 @@
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="inventory.domain.StockOut">
-        update stock_out
-        set 
-            product_id =  #{productId,jdbcType=INTEGER},
-            inbound_time =  #{inboundTime,jdbcType=TIMESTAMP},
-            inbound_batch =  #{inboundBatch,jdbcType=VARCHAR},
-            supplier_name =  #{supplierName,jdbcType=VARCHAR},
-            inbound_quantity =  #{inboundQuantity,jdbcType=INTEGER},
-            tax_inclusive_price =  #{taxInclusivePrice,jdbcType=DECIMAL},
-            tax_inclusive_total =  #{taxInclusiveTotal,jdbcType=DECIMAL},
-            tax_rate =  #{taxRate,jdbcType=DECIMAL},
-            tax_exclusive_total =  #{taxExclusiveTotal,jdbcType=DECIMAL},
-            inbound_person =  #{inboundPerson,jdbcType=VARCHAR}
-        where   id = #{id,jdbcType=INTEGER} 
-    </update>
+
 </mapper>
diff --git a/src/main/resources/mapper/StockProductMapper.xml b/src/main/resources/mapper/inventory/StockProductMapper.xml
similarity index 76%
rename from src/main/resources/mapper/StockProductMapper.xml
rename to src/main/resources/mapper/inventory/StockProductMapper.xml
index c9a745a..ad820b3 100644
--- a/src/main/resources/mapper/StockProductMapper.xml
+++ b/src/main/resources/mapper/inventory/StockProductMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="inventory.mapper.StockProductMapper">
+<mapper namespace="com.ruoyi.inventory.mapper.StockProductMapper">
 
     <resultMap id="BaseResultMap" type="inventory.domain.StockProduct">
             <id property="id" column="id" jdbcType="INTEGER"/>
@@ -22,18 +22,17 @@
         from stock_product
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectList" resultType="inventory.domain.StockProduct">
+        select
+        <include refid="Base_Column_List" />
+        from stock_product
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from stock_product
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockProduct" useGeneratedKeys="true">
-        insert into stock_product
-        ( id,product_category,spec_model
-        ,unit)
-        values (#{id,jdbcType=INTEGER},#{productCategory,jdbcType=VARCHAR},#{specModel,jdbcType=VARCHAR}
-        ,#{unit,jdbcType=VARCHAR})
-    </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockProduct" useGeneratedKeys="true">
         insert into stock_product
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -64,12 +63,5 @@
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="inventory.domain.StockProduct">
-        update stock_product
-        set 
-            product_category =  #{productCategory,jdbcType=VARCHAR},
-            spec_model =  #{specModel,jdbcType=VARCHAR},
-            unit =  #{unit,jdbcType=VARCHAR}
-        where   id = #{id,jdbcType=INTEGER} 
-    </update>
+
 </mapper>

--
Gitblit v1.9.3