From cea67e683a7b2fd182ba3aaed3080f9029d7aea5 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 12 Nov 2024 12:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/bases/controller/PaTypeController.java   | 11 ++++++++++-
 .../bonus/gzgqj/business/bases/entity/PaTypeVo.java   |  2 ++
 .../gzgqj/business/bases/service/PaTypeService.java   |  7 +++++++
 .../business/bases/service/PaTypeServiceImpl.java     | 11 +++++++++++
 .../business/bases/service/PartInputServiceImpl.java  |  9 +++++++++
 src/main/resources/mappers/bases/PaTypeMapper.xml     | 11 ++++++-----
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java
index 09bfcd0..3eaf37b 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java
@@ -74,7 +74,16 @@ public class PaTypeController {
         return  service.deleteTypeData(dto.getData());
     }
 
-
+    /**
+     *  查询 树集合
+     * @param dto
+     * @return
+     */
+    @GetMapping("getTypeDetails")
+    @DecryptAndVerify(decryptedClass = PaTypeVo.class)
+    public ServerResponse getTypeDetails(EncryptedReq<PaTypeVo> dto) {
+        return  service.getTypeDetails(dto.getData());
+    }
     /**
      * 分页查询配件入库
      * @param dto
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
index c2497be..a53d44e 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PaTypeVo.java
@@ -54,4 +54,6 @@ public class PaTypeVo {
 
     private String type;
 
+    private String parentName;
+
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java
index 88e9792..67d6bd1 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java
@@ -48,4 +48,11 @@ public interface PaTypeService {
     List<PaTypeVo> findByPage(PaTypeVo data);
 
     ServerResponse getVendList(VendVo data);
+
+    /**
+     * 依据id查询详情
+     * @param data
+     * @return
+     */
+    ServerResponse getTypeDetails(PaTypeVo data);
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
index feeb845..b359d86 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java
@@ -174,5 +174,16 @@ public class PaTypeServiceImpl  implements PaTypeService{
         return   ServerResponse.createSuccess(list);
     }
 
+    @Override
+    public ServerResponse getTypeDetails(PaTypeVo data) {
+        try{
+            PaTypeVo  vo=mapper.getTypeDetails(data.getId());
+            return   ServerResponse.createSuccess(vo);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return   ServerResponse.createSuccess(new PaTypeVo());
+    }
+
 
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
index b4a785f..ac7ff20 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java
@@ -57,6 +57,15 @@ public class PartInputServiceImpl implements PartInputService{
       try{
           String params=request.getParameter("params");
           PartInputVo vo= JSON.parseObject(params,PartInputVo.class);
+          if(StringHelper.isEmpty(vo.getCreator())){
+              return  ServerResponse.createErroe("请填写入库人");
+          }
+          if(StringHelper.isEmpty(vo.getInputDay())){
+              return  ServerResponse.createErroe("请填写入库日期");
+          }
+          if(files==null || files.length<=0){
+              return  ServerResponse.createErroe("未上传入库单");
+          }
 
 
 
diff --git a/src/main/resources/mappers/bases/PaTypeMapper.xml b/src/main/resources/mappers/bases/PaTypeMapper.xml
index 932c10b..c91d875 100644
--- a/src/main/resources/mappers/bases/PaTypeMapper.xml
+++ b/src/main/resources/mappers/bases/PaTypeMapper.xml
@@ -19,11 +19,12 @@
 		WHERE is_active=1
 	</select>
 	<select id="getTypeDetails" resultType="com.bonus.gzgqj.business.bases.entity.PaTypeVo">
-		select id,parent_id pId,name,num,
-			   price,unit,weight,is_consumables ,
-			   remarks,is_active ,level,warn_num
-		FROM pa_type
-		WHERE is_active=1 and id=#{id}
+		select pt.id,pt.parent_id parentId,pt.name,pt.num,pt1.name parentName,
+			   pt.price,pt.unit,pt.weight,pt.is_consumables ,
+			   pt.remarks,pt.is_active ,pt.level,pt.warn_num
+		FROM pa_type pt
+				 left join   pa_type pt1 on pt.parent_id=pt1.id  and pt1.`level`=2 and pt1.is_active=1
+		WHERE pt.is_active=1 and id=#{id}
 	</select>
 	<select id="getChildList" resultType="java.lang.String">
 		select id