From dc6af9afa4d7071f09a1f04c51a0d9a5406dca31 Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Fri, 21 Feb 2025 11:43:37 +0800
Subject: [PATCH] =?UTF-8?q?demo=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PurchaseInventoryController.java            | 7 +++----
 .../web/inventorymanage/dto/InventoryReceiptInitDto.java   | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
index 671b49f0..689e4f40 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java
@@ -85,7 +85,7 @@ public class PurchaseInventoryController {
      *
      * @param inventoryDto 供应请求信息
      */
-    @PostMapping("/add-inventory-receipt")
+    @PostMapping("/inventory-receipt")
     public R<?> addSupplyRequest(@Validated @RequestBody InventoryDto inventoryDto) {
         // 生成待发送的入库单据supply_request
         SupplyRequest supplyRequest = new SupplyRequest();
@@ -118,7 +118,7 @@ public class PurchaseInventoryController {
      *
      * @param saveInventoryReceiptDto 供应请求信息
      */
-    @PutMapping("/edit-inventory-receipt")
+    @PutMapping("/inventory-receipt")
     public R<?> editSupplyRequest(@Validated @RequestBody SaveInventoryReceiptDto saveInventoryReceiptDto) {
         // 更新supply_request信息
         SupplyRequest saveRequest = new SupplyRequest();
@@ -138,10 +138,9 @@ public class PurchaseInventoryController {
      *
      * @param supplyRequestId 主表id
      */
-    @DeleteMapping("/delete-inventory-receipt")
+    @DeleteMapping("/inventory-receipt")
     public R<?> deleteSupplyRequest(@RequestParam Long supplyRequestId) {
         // 全都是逻辑删除
-        // todo:拓展mybatisplus ：删除就是软删除 ，查询默认加上delFlag条件，通过传参实现查看被删除的项目
 
         boolean deleteSuccess = supplyRequestService.removeById(supplyRequestId);
 
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java
index a322065c..f02af0d1 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/InventoryReceiptInitDto.java
@@ -22,6 +22,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class InventoryReceiptInitDto {
 
+    //返回前台的应是dto 懒得定义请勿学习
+
     /** 药房信息 */
     private List<Location> location;