From 130d780570cc44f33b41d477b4cdf049ed9e2c63 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Mon, 15 Jul 2024 11:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?=
 =?UTF-8?q?=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/modules/spares/controller/InboundController.java | 6 +++---
 .../spares/controller/MaterialClassCodeController.java      | 6 +++---
 .../modules/spares/controller/MaterialController.java       | 6 +++---
 .../modules/spares/controller/OutboundController.java       | 6 +++---
 .../java/org/energy/modules/spares/entity/Material.java     | 5 +++++
 .../org/energy/modules/spares/mapper/MaterialMapper.xml     | 1 +
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/energy/modules/spares/controller/InboundController.java b/src/main/java/org/energy/modules/spares/controller/InboundController.java
index e7a85f9..df44316 100644
--- a/src/main/java/org/energy/modules/spares/controller/InboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/InboundController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/inbound")
+@RequestMapping("/spares//inbound")
 @Api(value = "入库", tags = "入库接口")
 public class InboundController extends DafController {
 
@@ -111,7 +111,7 @@ public class InboundController extends DafController {
 		return R.status(inboundService.saveOrUpdate(inbound));
 	}
 
-	
+
 	/**
 	 * 删除 入库
 	 */
@@ -122,5 +122,5 @@ public class InboundController extends DafController {
 		return R.status(inboundService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
index dc059be..8d6db1a 100644
--- a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/materialclasscode")
+@RequestMapping("/spares//materialclasscode")
 @Api(value = "物资分类码", tags = "物资分类码接口")
 public class MaterialClassCodeController extends DafController {
 
@@ -111,7 +111,7 @@ public class MaterialClassCodeController extends DafController {
 		return R.status(materialClassCodeService.saveOrUpdate(materialClassCode));
 	}
 
-	
+
 	/**
 	 * 删除 物资分类码
 	 */
@@ -122,5 +122,5 @@ public class MaterialClassCodeController extends DafController {
 		return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialController.java b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
index b05bd03..2d86a86 100644
--- a/src/main/java/org/energy/modules/spares/controller/MaterialController.java
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/material")
+@RequestMapping("/spares//material")
 @Api(value = "物资", tags = "物资接口")
 public class MaterialController extends DafController {
 
@@ -111,7 +111,7 @@ public class MaterialController extends DafController {
 		return R.status(materialService.saveOrUpdate(material));
 	}
 
-	
+
 	/**
 	 * 删除 物资
 	 */
@@ -122,5 +122,5 @@ public class MaterialController extends DafController {
 		return R.status(materialService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }
diff --git a/src/main/java/org/energy/modules/spares/controller/OutboundController.java b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
index 45d5a9d..36e9c91 100644
--- a/src/main/java/org/energy/modules/spares/controller/OutboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/outbound")
+@RequestMapping("/spares//outbound")
 @Api(value = "出库", tags = "出库接口")
 public class OutboundController extends DafController {
 
@@ -111,7 +111,7 @@ public class OutboundController extends DafController {
 		return R.status(outboundService.saveOrUpdate(outbound));
 	}
 
-	
+
 	/**
 	 * 删除 出库
 	 */
@@ -122,5 +122,5 @@ public class OutboundController extends DafController {
 		return R.status(outboundService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }
diff --git a/src/main/java/org/energy/modules/spares/entity/Material.java b/src/main/java/org/energy/modules/spares/entity/Material.java
index 6ef83c9..efb1439 100644
--- a/src/main/java/org/energy/modules/spares/entity/Material.java
+++ b/src/main/java/org/energy/modules/spares/entity/Material.java
@@ -72,6 +72,11 @@ public class Material extends BaseEntity {
      */
     @ApiModelProperty(value = "物资描述")
     private String materialDescription;
+    /**
+     * 场站
+     */
+    @ApiModelProperty(value = "场站")
+    private Long station;
     /**
      * 审核状态
      */
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
index 5274c47..81fc633 100644
--- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
@@ -20,6 +20,7 @@
         <result column="warehouse" property="warehouse"/>
         <result column="inventory_count" property="inventoryCount"/>
         <result column="material_description" property="materialDescription"/>
+        <result column="station" property="station"/>
         <result column="istatus" property="istatus"/>
     </resultMap>