feat: 人员装备功能开发

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -35,7 +35,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/stock-detail/airport/person/bind", method = RequestMethod.POST)
-    ResponseModel<List<Object>> stockBindEquip(@RequestBody List<Long> ids) throws InnerInvokException;
+    ResponseModel<List<Object>> stockBindEquip(@RequestBody List<Map<String, Number>> stocks) throws InnerInvokException;
 
     /**
      * 人员装备退装
@@ -43,7 +43,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/scrap/airport/person", method = RequestMethod.POST)
-    ResponseModel<Object> scrapEquip(@RequestBody String id) throws InnerInvokException;
+    ResponseModel<Object> scrapEquip(@RequestBody Map<String, Object> map) throws InnerInvokException;
 
     /**
      * 人员装备回库
@@ -173,8 +173,8 @@ public interface EquipFeignClient {
      **/
     @RequestMapping(value = "/car/getTeamCarList", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> getTeamCarList(@RequestParam("sequenceNbr") String sequenceNbr,@RequestParam("longitude") Double longitude, @RequestParam("latitude") Double latitude);
-    
-    
+
+
     /**
      * 车辆信息详情
      **/
@@ -365,7 +365,7 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/perf-quota/listAll", method = RequestMethod.POST)
     ResponseModel<List<EquipmentIndexDto>> getEquipmentIndexDto(@RequestBody PerfQuotaIotDTO perfQuotaIotDTO);
 
-    
+
     @RequestMapping(value = "/car/{id}", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> selectOneById( @PathVariable("id") Long id);
 
@@ -384,17 +384,17 @@ public interface EquipFeignClient {
 
     @RequestMapping(value = "/equipment/list/{typeCode}", method = RequestMethod.GET)
     ResponseModel<List<Object>> getEquipmentList(@PathVariable("typeCode") String typeCode);
-    
+
     @RequestMapping(value = "equipment-category/list-tree", method = RequestMethod.GET)
     ResponseModel<Object>   list() ;
 
     //获取消防装备权限
     @RequestMapping(value = "/equipment-detail/permissions/export", method = RequestMethod.GET)
     ResponseModel<ReginParams>  getPermissions() ;
-    
+
     @RequestMapping(value = "/building/getBuildingList", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getBuildingTreeList();
-    
+
     @RequestMapping(value = "/building/companyBuildingTree", method = RequestMethod.GET)
     public  ResponseModel<Object> getCompanyBuildingTree();
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersJacketMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
 
+import java.util.List;
+import java.util.Map;
+
 /**
 * 消防人员配装记录 Mapper 接口
 *
@@ -11,4 +14,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
 */
 public interface FirefightersJacketMapper extends BaseMapper<FirefightersJacket> {
 
+    List<Map<String, Object>> getPersonEquipCount();
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersJacketMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FirefightersJacketMapper">
-
+    <select id="getPersonEquipCount" resultType="java.util.Map">
+        SELECT
+            equipment_type_name AS name,
+            SUM(amount) AS value,
+            '个' AS unnit
+        FROM
+            jc_firefighters_jacket
+        WHERE
+            is_delete = 0
+        GROUP BY
+            equipment_type_name
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/EquipTypeEnum.java

@@ -15,7 +15,7 @@ public enum EquipTypeEnum {
     /**
      * 退库,回库
      */
-    退装("scrap", "退装"),
+    报废("scrap", "报废"),
     回库("stock",  "回库");
 
     private String key;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersJacketService.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * 消防人员配装记录 服务类
@@ -16,6 +17,8 @@ import java.util.List;
 */
 public interface IFirefightersJacketService {
 
+    List<Map<String, Object>> getPersonEquipCount();
+
     ResponseModel<Page<Object>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size);
 
     boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -267,6 +267,9 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "列表分页查询")
     public IPage<EquipmentOnCarVo> onCarVoIPage(@RequestBody EquipmentSpecificDto equipmentSpecificDto) {
+        ReginParams ReginParams = getSelectedOrgInfo();
+        String bizOrgCode= ReginParams.getPersonIdentity().getBizOrgCode();
+        equipmentSpecificDto.setBizOrgCode(bizOrgCode);
         return equipmentSpecificSerivce.onCarVoIPage(equipmentSpecificDto);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ScrapController.java

@@ -26,9 +26,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
- * 
+ *
  *
  * @author wujiang
  * @date 2020-07-07
@@ -43,7 +44,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 新增
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
@@ -55,7 +56,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 根据id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -68,7 +69,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 修改
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@@ -80,7 +81,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 根据id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -93,7 +94,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 列表分页查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -142,7 +143,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 新建报废
-	 * 
+	 *
 	 * @param list
 	 * @return
 	 */
@@ -155,7 +156,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 执行报废
-	 * 
+	 *
 	 * @param param
 	 * @return
 	 */
@@ -171,7 +172,7 @@ public class ScrapController extends AbstractBaseController {
 
 	/**
 	 * 执行报废
-	 * 
+	 *
 	 * @param
 	 * @return
 	 */
@@ -221,9 +222,9 @@ public class ScrapController extends AbstractBaseController {
 	@RequestMapping(value = "/airport/person", method = RequestMethod.POST)
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "机场人员装备退装接口", notes = "人员装备报废", produces = "application/json;charset=UTF-8")
-	public ResponseModel scrapOnPerson(@RequestBody String id) {
+	public ResponseModel scrapOnPerson(@RequestBody Map<String, Object> map) {
 		try {
-			iScrapService.scrapOnPerson(Long.valueOf(id));
+			iScrapService.scrapOnPerson(map, getUserInfo());
 		} catch (Exception e) {
 			return CommonResponseUtil.failure("人员装备报废失败！");
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/StockDetailController.java

@@ -39,7 +39,7 @@ public class StockDetailController {
 
 	/**
 	 * 新增库存明细
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
@@ -51,7 +51,7 @@ public class StockDetailController {
 
 	/**
 	 * 根据id删除
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -64,7 +64,7 @@ public class StockDetailController {
 
 	/**
 	 * 修改库存明细
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@@ -76,7 +76,7 @@ public class StockDetailController {
 
 	/**
 	 * 根据id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -89,7 +89,7 @@ public class StockDetailController {
 
 	/**
 	 * 列表分页查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -136,7 +136,7 @@ public class StockDetailController {
 
 	/**
 	 * 指定位置指定分类下库存查询 以分类为主（灭火药剂入账列表）
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/category", method = RequestMethod.GET)
@@ -157,7 +157,7 @@ public class StockDetailController {
 
 	/**
 	 * 指定位置指定分类库存查询 以库存为主（灭火药剂装载列表）
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/stock", method = RequestMethod.GET)
@@ -179,7 +179,7 @@ public class StockDetailController {
 
 	/**
 	 * 列表分页查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/place/equipment", method = RequestMethod.GET)
@@ -214,10 +214,10 @@ public class StockDetailController {
 	@RequestMapping(value = "/airport/person/bind", method = RequestMethod.POST)
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "人员装备列装接口", notes = "人员装备列装", produces = "application/json;charset=UTF-8")
-	public ResponseModel loadOnPerson(@RequestBody List<String> ids) {
+	public ResponseModel loadOnPerson(@RequestBody List<Map<String, Number>> stocks) {
 		List<StockDetail> stockDetails = null;
-		if (0 < ids.size()) {
-			stockDetails = iStockDetailService.loadOnPerson(ids);
+		if (!stocks.isEmpty()) {
+			stockDetails = iStockDetailService.loadOnPerson(stocks);
 		}
 		return CommonResponseUtil.success(stockDetails);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IScrapService.java

@@ -10,6 +10,7 @@ import com.yeejoin.equipmanage.common.entity.ScrapDetail;
 import com.yeejoin.equipmanage.common.entity.SystemDic;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -29,7 +30,7 @@ public interface IScrapService extends IService<Scrap> {
 
 	void scrapOnCar(Long id);
 
-	void scrapOnPerson(Long id);
+	void scrapOnPerson(Map<String, Object> map, AgencyUserModel agencyUserModel);
 
 	void delPerson(Long id);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IStockDetailService.java

@@ -24,7 +24,7 @@ public interface IStockDetailService extends IService<StockDetail> {
 
 	IPage<StockDetail> pagePlaceEquip(Page<StockDetail> pageBean, Long equipmentDetailId, Long warehouseStructureId);
 
-	List<StockDetail> loadOnPerson(List<String> ids);
+	List<StockDetail> loadOnPerson(List<Map<String, Number>> stocks);
 
 	StockDetail unloadPerson(Map<String, Object> map);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ScrapServiceImpl.java

@@ -72,6 +72,7 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
         scrap.setBillCode(stockBillService.generateQrCode("BF"));
         scrap.setBillType(type);
         scrap.setStatus(TaskStatusEnum.INPROGRESS.getCode());
+        scrap.setUserId(Long.valueOf(agencyUserModel.getUserId()));
         scrap.setCreatorName(agencyUserModel.getRealName());
         scrapService.save(scrap);
 		for (ScrapDetail scrapDetail : list) {
@@ -312,15 +313,20 @@ public class ScrapServiceImpl extends ServiceImpl<ScrapMapper, Scrap> implements
     }
 
     @Override
-    public void scrapOnPerson(Long id) {
-//        QueryWrapper<StockDetail> queryWrapper = new QueryWrapper<>();
-//        StockDetail stockDetail = stockDetailService.getOne(queryWrapper.eq("equipment_specific_id", id));
+    @Transactional
+    public void scrapOnPerson(Map<String, Object> map, AgencyUserModel agencyUserModel) {
+        Long id = Long.valueOf(map.get("stockDetailId").toString());
+        double amount = Double.parseDouble(map.get("amount").toString());
         StockDetail stockDetail = stockDetailService.getById(id);
         if (null == stockDetail) {
             throw new RuntimeException("id为"+ id + "的StockDetail实体不存在！");
         }
-        stockDetail.setStatus(String.valueOf(EquipStatusEnum.SCRAP.getCode()));
         stockDetailService.updateById(stockDetail);
+        // 添加报废流程
+        ScrapDetail scrapDetail = new ScrapDetail();
+        scrapDetail.setStockDetailId(stockDetail.getId());
+        scrapDetail.setAmount(amount);
+        this.create(Collections.singletonList(scrapDetail), BillContentEnum.ZB.getCode(), agencyUserModel);
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockDetailServiceImpl.java

@@ -144,15 +144,20 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
     }
 
     @Override
-    public List<StockDetail> loadOnPerson(List<String> ids) {
+    public List<StockDetail> loadOnPerson(List<Map<String, Number>> stocks) {
         List<StockDetail> list = new ArrayList<>();
-        ids.forEach(x -> {
-            StockDetail stockDetail = this.baseMapper.selectById(Long.valueOf(x));
+        stocks.forEach(x -> {
+            StockDetail stockDetail = this.baseMapper.selectById(Long.valueOf(x.get("stockDetailId").toString()));
             if (null == stockDetail) {
                 throw new RuntimeException("id 为"+ x + "的StockDetail不存在 ！");
             }
-            stockDetail.setStatus(String.valueOf(EquipStatusEnum.LOAD.getCode()));
-            stockDetail.setAmount(Math.abs(stockDetail.getAmount() - 1.0));
+            double stockAmount = stockDetail.getAmount() - Double.parseDouble(x.get("amount").toString());
+            if (stockAmount < 0) {
+                throw new RuntimeException("库存不足");
+            } else if (stockAmount == 0) {
+                stockDetail.setStatus(String.valueOf(EquipStatusEnum.LOAD.getCode()));
+            }
+            stockDetail.setAmount(stockAmount);
             this.baseMapper.updateById(stockDetail);
             list.add(stockDetail);
         });
@@ -196,12 +201,14 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
 
     @Override
     public StockDetail unloadPerson(Map<String, Object> map) {
-//        Long structureId = Long.valueOf(String.valueOf(map.get("warehouseStructureId")));
         Long stockDetailId = Long.valueOf(String.valueOf(map.get("stockDetailId")));
+        double amount = Double.parseDouble(String.valueOf(map.get("amount")));
+        if (amount == 0) {
+            throw new RuntimeException("数量不能为空");
+        }
         StockDetail stockDetail = this.baseMapper.selectById(stockDetailId);
         stockDetail.setStatus(String.valueOf(EquipStatusEnum.REPERTORY.getCode()));//陈浩修改，原本退装枚举值所对应的jcs逻辑是回库，现确定为在位状态
-//        stockDetail.setWarehouseStructureId(structureId);
-        stockDetail.setAmount(stockDetail.getAmount() + 1.0);
+        stockDetail.setAmount(stockDetail.getAmount() + amount);
         this.baseMapper.updateById(stockDetail);
         return stockDetail;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -174,6 +176,16 @@ public class FirefightersJacketController extends BaseController {
     }
 
     /**
+     * 分页查询设备数量（调用装备接口）
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "人员装备数量")
+    @RequestMapping(value = "/person-equip-count", method = RequestMethod.GET)
+    public ResponseModel<List<Map<String, Object>>> getPersonEquipCount() {
+        return ResponseHelper.buildResponse(iFirefightersJacketService.getPersonEquipCount());
+    }
+
+    /**
      * 分页查询设备列表（调用装备接口）
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersJacketServiceImpl.java

@@ -36,6 +36,13 @@ public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacke
 
     @Autowired
     private EquipFeignClient equipFeignClient;
+    @Autowired
+    private FirefightersJacketMapper firefightersJacketMapper;
+
+    @Override
+    public List<Map<String, Object>> getPersonEquipCount() {
+        return firefightersJacketMapper.getPersonEquipCount();
+    }
 
     @Override
     public ResponseModel<Page<Object>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size) {
@@ -47,9 +54,15 @@ public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacke
 
     @Override
     public boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos) {
-        List<Long> ids = equipmentOnCarDtos.stream().map(EquipmentOnCarDto::getStockDetailId).collect(Collectors.toList());
-        List<Object> result = equipFeignClient.stockBindEquip(ids).getResult();
-        if (result.size() > 0) {
+        List<Map<String, Number>> stocks = new ArrayList<>();
+        for (EquipmentOnCarDto dto : equipmentOnCarDtos) {
+            stocks.add(new HashMap<String, Number>() {{
+                this.put("stockDetailId", dto.getStockDetailId());
+                this.put("amount", dto.getAmount());
+            }});
+        }
+        List<Object> result = equipFeignClient.stockBindEquip(stocks).getResult();
+        if (!result.isEmpty()) {
             List<FirefightersJacket> firefightersJackets = new ArrayList<>();
             equipmentOnCarDtos.forEach(x -> {
                 FirefightersJacket firefightersJacket = new FirefightersJacket();
@@ -70,11 +83,13 @@ public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacke
     @Override
     public boolean update(String type, FirefightersJacket firefightersJacket) {
         ResponseModel<Object> objectResponseModel = null;
-        if (EquipTypeEnum.退装.getKey().equals(type)) {
-            objectResponseModel = equipFeignClient.scrapEquip(String.valueOf(firefightersJacket.getStockDetailId()));
+        Map<String, Object> map = new HashMap<>();
+        map.put("firefightersId", firefightersJacket.getFirefightersId());
+        map.put("stockDetailId", firefightersJacket.getStockDetailId());
+        map.put("amount", firefightersJacket.getAmount());
+        if (EquipTypeEnum.报废.getKey().equals(type)) {
+            objectResponseModel = equipFeignClient.scrapEquip(map);
         } else if (EquipTypeEnum.回库.getKey().equals(type)) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("stockDetailId", firefightersJacket.getStockDetailId());
             objectResponseModel = equipFeignClient.stockEquip(map);
         }
         if (ValidationUtil.isEmpty(objectResponseModel)){

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirestationJacketServiceImpl.java

@@ -51,7 +51,14 @@ public class FirestationJacketServiceImpl extends BaseService<FirestationJacketD
     @Override
     public boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos) {
         List<Long> ids = equipmentOnCarDtos.stream().map(EquipmentOnCarDto::getStockDetailId).collect(Collectors.toList());
-        List<Object> result = equipFeignClient.stockBindEquip(ids).getResult();
+        List<Map<String, Number>> stocks = new ArrayList<>();
+        for (EquipmentOnCarDto dto : equipmentOnCarDtos) {
+            stocks.add(new HashMap<String, Number>() {{
+                this.put("id", dto.getStockDetailId());
+                this.put("amount", dto.getAmount());
+            }});
+        }
+        List<Object> result = equipFeignClient.stockBindEquip(stocks).getResult();
         if (result.size() > 0) {
             List<FirestationJacket> firefightersJackets = new ArrayList<>();
             equipmentOnCarDtos.forEach(x -> {
@@ -73,11 +80,13 @@ public class FirestationJacketServiceImpl extends BaseService<FirestationJacketD
     @Override
     public boolean update(String type, FirestationJacket firestationJacket) {
         ResponseModel<Object> objectResponseModel = null;
-        if (EquipTypeEnum.退装.getKey().equals(type)) {
-            objectResponseModel = equipFeignClient.scrapEquip(String.valueOf(firestationJacket.getStockDetailId()));
+        Map<String, Object> map = new HashMap<>();
+        map.put("firefightersId", firestationJacket.getFirefightersId());
+        map.put("stockDetailId", firestationJacket.getStockDetailId());
+        map.put("amount", firestationJacket.getAmount());
+        if (EquipTypeEnum.报废.getKey().equals(type)) {
+            objectResponseModel = equipFeignClient.scrapEquip(map);
         } else if (EquipTypeEnum.回库.getKey().equals(type)) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("stockDetailId", firestationJacket.getStockDetailId());
             objectResponseModel = equipFeignClient.stockEquip(map);
         }
         if (ValidationUtil.isEmpty(objectResponseModel)){
@@ -87,6 +96,7 @@ public class FirestationJacketServiceImpl extends BaseService<FirestationJacketD
         return true;
     }
 
+
     @Override
     public ResponseModel<Object> getEquipByStockDetailId(Long stockDetailId) {
         return equipFeignClient.getAirEquipSpecificDetail(stockDetailId);