From c128ed33c2447e8daea89d70795098748bd5b2af Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 06 一月 2023 10:53:27 +0800
Subject: [PATCH] 补充查询单条领取记录接口
---
equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java b/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
index b5cbfb2..e98d15e 100644
--- a/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
+++ b/equipment/equipment-rpc-provider/src/main/java/com/gkhy/safePlatform/equipment/rpc/provider/EquipmentRpcProvider.java
@@ -3,6 +3,8 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.equipment.entity.MaterialReceiveRecordsBO;
+import com.gkhy.safePlatform.equipment.entity.MaterialReceiveRecordsDO;
import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyDO;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
import com.gkhy.safePlatform.equipment.model.dto.req.MaterialSpwDeliveryReq;
@@ -11,14 +13,14 @@
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyStockDto;
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeRfidMaterialDetailDto;
import com.gkhy.safePlatform.equipment.rpc.api.EquipmentRpcAPi;
+import com.gkhy.safePlatform.equipment.rpc.api.model.dto.req.MaterialReceiveRecordsRPCReq;
import com.gkhy.safePlatform.equipment.rpc.api.model.dto.req.MaterialSpwDeliveryRPCReq;
import com.gkhy.safePlatform.equipment.rpc.api.model.dto.req.MaterialSpwRPCReq;
-import com.gkhy.safePlatform.equipment.rpc.api.model.dto.resp.SafeMaterialBsClassifyRPCRespDto;
-import com.gkhy.safePlatform.equipment.rpc.api.model.dto.resp.SafeMaterialClassifyRPCRespDto;
-import com.gkhy.safePlatform.equipment.rpc.api.model.dto.resp.SafeMaterialClassifyStockRPCRespDto;
-import com.gkhy.safePlatform.equipment.rpc.api.model.dto.resp.SafeRfidMaterialDetailRPCRespDto;
+import com.gkhy.safePlatform.equipment.rpc.api.model.dto.resp.*;
import com.gkhy.safePlatform.equipment.service.MaterialClassifyService;
+import com.gkhy.safePlatform.equipment.service.MaterialReceiveRecordsService;
import com.gkhy.safePlatform.equipment.service.SafeMaterialDetailService;
+import com.gkhy.safePlatform.equipment.service.impl.MaterialReceiveRecordsServiceImpl;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,8 @@
private MaterialClassifyService materialClassifyService;
@Autowired
private SafeMaterialDetailService safeMaterialDetailService;
+ @Autowired
+ private MaterialReceiveRecordsService materialReceiveRecordsService;
public ResultVO<List<SafeMaterialClassifyRPCRespDto>> getMaterialClassifyList(){
@@ -47,11 +51,17 @@
List<SafeMaterialClassifyDto> childList = classifyDto.getChildList();
List<SafeMaterialClassifyRPCRespDto> childRPCList = new ArrayList<>();
for(SafeMaterialClassifyDto child:childList){
- SafeMaterialClassifyRPCRespDto childRPCRespDto = new SafeMaterialClassifyRPCRespDto();
- childRPCRespDto.setId(child.getId());
- childRPCRespDto.setParentId(child.getParentId());
- childRPCRespDto.setMaterialClassifyName(child.getMaterialClassifyName());
- childRPCList.add(childRPCRespDto);
+ //临时限制一下
+ if(child.getConsumable() == 1){
+ SafeMaterialClassifyRPCRespDto childRPCRespDto = new SafeMaterialClassifyRPCRespDto();
+ childRPCRespDto.setId(child.getId());
+ childRPCRespDto.setParentId(child.getParentId());
+ childRPCRespDto.setMaterialClassifyName(child.getMaterialClassifyName());
+ childRPCRespDto.setConsumable(child.getConsumable());
+ childRPCRespDto.setConsumableName(child.getConsumableName());
+ childRPCList.add(childRPCRespDto);
+ }
+
}
classifyRPCRespDto.setChildList(childRPCList);
rpcRespList.add(classifyRPCRespDto);
@@ -78,7 +88,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -98,7 +108,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -121,7 +131,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -144,7 +154,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
@@ -173,7 +183,7 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
}
@@ -192,7 +202,38 @@
resultVO.setMsg(e.getMessage());
}catch (Exception e){
resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
- resultVO.setCode(ResultCodes.SERVER_ERROR.getDesc());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
+
+ }
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<List<MaterialReceiveRecordsRPCRespDto>> getMaterialReceiveRecords(MaterialReceiveRecordsRPCReq req) {
+ ResultVO resultVO = new ResultVO<>(ResultCodes.OK);
+ MaterialReceiveRecordsBO materialReceiveRecordsBO = new MaterialReceiveRecordsBO();
+ if(null != req){
+ BeanUtils.copyProperties(req,materialReceiveRecordsBO);
+ }
+ try {
+ List<MaterialReceiveRecordsDO> list = materialReceiveRecordsService.getReceiveRecordsByReceiveUids(materialReceiveRecordsBO);
+ List<MaterialReceiveRecordsRPCRespDto> materialReceiveRecordsRPCRespDtos = new ArrayList<>();
+ if(list.size()>0){
+ for(MaterialReceiveRecordsDO recordsDO:list){
+ MaterialReceiveRecordsRPCRespDto receiveRecordsRPCRespDto = new MaterialReceiveRecordsRPCRespDto();
+ BeanUtils.copyProperties(recordsDO,receiveRecordsRPCRespDto);
+ materialReceiveRecordsRPCRespDtos.add(receiveRecordsRPCRespDto);
+ }
+ resultVO.setData(materialReceiveRecordsRPCRespDtos);
+ }
+ }catch (EquipmentException e){
+ e.printStackTrace();
+ resultVO.setCode(e.getCode());
+ resultVO.setMsg(e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ resultVO.setCode(ResultCodes.SERVER_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ERROR.getDesc());
}
return resultVO;
--
Gitblit v1.9.2