From f600f38c6c23a282b61ed4db1b2da094d695276f Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 25 十一月 2022 16:43:52 +0800
Subject: [PATCH] 安全物资和设备管理调整
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/SafeMaterialDetailController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/SafeMaterialDetailController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/SafeMaterialDetailController.java
index 0250924..619a9e5 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/SafeMaterialDetailController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/SafeMaterialDetailController.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.equipment.controller;
import com.alibaba.fastjson.JSONObject;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
@@ -99,8 +100,8 @@
* 批量重新入库
*/
@PostMapping(value = "/batch/receipt")
- public ResultVO receiptBatch(Authentication authentication, @RequestBody Long[] ids){
- return safeMaterialDetailService.receiptBatch(ids);
+ public ResultVO receiptBatch(Authentication authentication ,@Validated @RequestBody ParamForm paramForm){
+ return safeMaterialDetailService.receiptBatch(paramForm);
}
/**
* 删除-单条
@@ -119,8 +120,8 @@
* @return
*/
@PostMapping(value = "/deleteBatch")
- public ResultVO deleteBatch(Authentication authentication,@RequestBody Long[] ids){
- return safeMaterialDetailService.deleteBatch(ids);
+ public ResultVO deleteBatch(Authentication authentication,@Validated @RequestBody ParamForm paramForm){
+ return safeMaterialDetailService.deleteBatch(paramForm);
}
@@ -144,5 +145,23 @@
Long id = jsonObject.getLong("id");
return safeMaterialDetailService.queryById(id);
}
-
+ /**
+ * 特殊作业批量出库接口
+ * @param authentication
+ * @return
+ */
+ @PostMapping(value = "/deliveryBatchSpw")
+ public ResultVO deliveryBatchSpw(Authentication authentication, @Validated @RequestBody MaterialSpwReq req){
+ safeMaterialDetailService.deliveryBatchSpw(req);
+ return new ResultVO<>(ResultCodes.OK);
+ }
+ /* *//**
+ * 根据rfid获去数据
+ * @param authentication
+ * @return
+ *//*
+ @PostMapping(value = "/rfid/list")
+ public ResultVO getListByRfid(Authentication authentication, @RequestBody String[] rfids){
+ return new ResultVO(ResultCodes.OK,safeMaterialDetailService.getListByRfids(rfids));
+ }*/
}
--
Gitblit v1.9.2