Merge remote-tracking branch 'origin/develop_dl' into develop_dl

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

@@ -355,7 +355,16 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
                 .collect(Collectors.groupingBy(EquipmentIndex::getEquipmentId));
         Map<Long, Unit> unitMap = iUnitService.list().stream().collect(Collectors.toMap(Unit::getId, t -> t));
         Map<Long, EquipmentCategory> categoryMap = equipmentCategoryMapper.selectList(null).stream().collect(Collectors.toMap(EquipmentCategory::getId, t -> t));
-        for (Equipment equipment : list) {
+        for (int i = 0; i <list.size(); i++) {
+            Equipment equipment = list.get(i);
+            EquipmentCategory equipmentCategory = categoryMap.get(equipment.getCategoryId());
+            String categoryCode = equipment.getCode();
+            // 移除非消耗性设备
+            if (Objects.isNull(equipmentCategory) || !Objects.equals(equipmentCategory.getIndustryCode(), "2") || categoryCode.charAt(0) == '2' || categoryCode.charAt(0) == '9') {
+                list.remove(equipment);
+                i--;
+                continue;
+            }
             List<EquipmentIndex> quotaList = equipmentIndexMap.get(equipment.getId().toString());
             List<EquProperty> properList = new ArrayList<EquProperty>();
             if (CollUtil.isNotEmpty(quotaList)) {
@@ -371,7 +380,6 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
                     properList.add(equProperty);
                 }
             }
-            EquipmentCategory equipmentCategory = categoryMap.get(equipment.getCategoryId());
             if (ObjectUtils.isNotEmpty(equipmentCategory)) {
                 equipment.setEquipCategoryId(equipmentCategory.getId());
                 equipment.setEquipCategoryCode(equipmentCategory.getCode());

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

@@ -240,14 +240,12 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
 
     @Override
     public void subtractNum(Long id, Float num) {
-        synchronized (id.toString()) {
-            WlSpareEquipment wlSpareEquipment = this.getById(id);
-            if (num > wlSpareEquipment.getStockNum()) {
-                throw new BadRequest("使用数量大于备品备件库存数量");
-            }
-            wlSpareEquipment.setStockNum(wlSpareEquipment.getStockNum() - num);
-            this.updateById(wlSpareEquipment);
+        WlSpareEquipment wlSpareEquipment = this.getById(id);
+        if (num > wlSpareEquipment.getStockNum()) {
+            throw new BadRequest("使用数量大于备品备件库存数量");
         }
+        wlSpareEquipment.setStockNum(wlSpareEquipment.getStockNum() - num);
+        this.updateById(wlSpareEquipment);
     }
 
     @Override

amos-boot-system-equip/src/main/resources/mapper/WlSpareEquipmentMapper.xml

@@ -53,6 +53,8 @@
     </where>
     GROUP BY
         a.equip_model_id
+    HAVING
+        sum( a.stock_num ) != 0
     </select>
 
 <select id="exportList" resultType="com.yeejoin.equipmanage.common.entity.WlSpareEquipment">