装备数量、吨数问题处理

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java

@@ -45,7 +45,7 @@ public class EquipmentSpecific extends BaseEntity {
 
     @ApiModelProperty(value = "批量录入数量")
     @TableField(exist = false)
-    private Integer num;
+    private Float num;
 
     @ApiModelProperty(value = "单位编码")
     @TableField("org_code")

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

@@ -196,7 +196,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         controllerProxy.refreshCount(vo.getBizOrgCode());
         WlSpareEquipment spareEquipment = equipmentDate.getSpareEquipment();
         if (ObjectUtil.isNotEmpty(spareEquipment) && ObjectUtil.isNotEmpty(spareEquipment.getId())) {
-            wlSpareEquipmentService.subtractNum(spareEquipment.getId(), Float.valueOf(vo.getNum()));
+            wlSpareEquipmentService.subtractNum(spareEquipment.getId(), vo.getNum());
         }
         return date;
     }

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

@@ -1322,7 +1322,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             //如果多个二维码说明单项管理，批量录入
             if (equipmentSpecific.getNum() > 1) {
                 //TODO 1.去掉模板概念了，把EquipmentDetail当成EquipmentSpecific一对一子表,有多少二维码生成就有多少个EquipmentDetail
-                List<EquipmentDetail> equipmentDetails = this.saveEquipmentDetailBatch(equipmentData.getEquipmentDetail(), equipmentSpecific.getNum());
+                List<EquipmentDetail> equipmentDetails = this.saveEquipmentDetailBatch(equipmentData.getEquipmentDetail(), (int) equipmentSpecific.getNum().floatValue());
                 //2.生成二维码数据
                 List<String> list = genQrCode(equipmentDetails);
                 //3.插入设备实例基本表
@@ -1429,7 +1429,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
                 //页面参数返回数据处理
                 EquipmentSpecific resultEquipSpec = equipmentSpecifics.get(0);
-                resultEquipSpec.setNum(1);
+                resultEquipSpec.setNum(1F);
                 equipmentData.setEquipmentDetail(equipmentDetails.get(0));
                 equipmentData.setEquipmentSpecific(resultEquipSpec);
             } else {

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

@@ -1081,6 +1081,10 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 
 
         list.getRecords().parallelStream().forEach(item -> {
+            if (!ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()))
+                    && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()).getAmount())) {
+                item.setAmount(finalStockDetailMap.get(item.getId()).getAmount().toString());
+            }
             if (!item.getEqtype().startsWith("4")
                     && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()))
                     && !ObjectUtils.isEmpty(finalStockDetailMap.get(item.getId()).getAmount())) {

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

@@ -648,7 +648,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                  equipmentSpecific.setIotCode(iotCode);
                  equipmentSpecific.setCode(equipmentDetailDownloadVOS.getSystemCode());
                  equipmentSpecific.setSystemId(fightSysIds.get());
-                 equipmentSpecific.setNum(1);
+                 equipmentSpecific.setNum(1F);
                  equipmentSpecific.setSingle(true);
                  fireFightSysIdsBuffer.append(fightSysIds.get() + ",");
                  // 导入新增所属队伍
@@ -814,7 +814,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             iotCode = ExcelUtils.replaceAllBlank(iotCode);
             equipmentSpecific.setIotCode(iotCode);
             equipmentSpecific.setCode(equipmentDetailDownloadVOS.get(i).getCode());
-            equipmentSpecific.setNum(1);
+            equipmentSpecific.setNum(1F);
             equipmentSpecific.setSingle(true);
             //数据检查