设备子系统———库存接口代码新增更新情况

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquOverhaulInventoryMapperDao.java

@@ -3,6 +3,8 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.bsentity.domain.EquOverhaulInventoryDo;
 import com.rongwei.rwcommon.base.BaseDao;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备子系统——备品备件库存 Mapper 接口
@@ -17,4 +19,10 @@ public interface EquOverhaulInventoryMapperDao extends BaseDao<EquOverhaulInvent
      * 系统自动根据安全库存信息、过期信息自动更新提醒状态
      */
     void updateInventoryReminderStatus();
+
+    /**
+     * 查询所有库存数据
+     * @return
+     */
+    List<EquOverhaulInventoryDo> selectAllInventory();
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquOverhaulInventoryService.java

@@ -4,6 +4,8 @@ package com.rongwei.bscommon.sys.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.EquOverhaulInventoryDo;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备子系统——备品备件库存 服务类
@@ -23,4 +25,10 @@ public interface EquOverhaulInventoryService extends IService<EquOverhaulInvento
      * 系统每个小时更新一次库存数据
      */
     void initializeInventory();
+
+    /**
+     * 查询所有库存数据
+     * @return
+     */
+    List<EquOverhaulInventoryDo> selectAllInventory();
 }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulInventoryServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -64,10 +65,11 @@ public class EquOverhaulInventoryServiceImpl extends ServiceImpl<EquOverhaulInve
         // 查询所有工厂数据
         List<SysOrganizationVo> factoryList = commonDao.getAllFactoryNameAndId();
         // 查询库存表已有数据列表
-        List<EquOverhaulInventoryDo> queryInventoryDos = equOverhaulInventoryService.list(new LambdaQueryWrapper<EquOverhaulInventoryDo>().eq(EquOverhaulInventoryDo::getDeleted, 0));
+        List<EquOverhaulInventoryDo> queryInventoryDos = equOverhaulInventoryService.selectAllInventory();
         for (VInventoryVo inventoryVo : allOracleInventory) {
             EquOverhaulInventoryDo equOverhaulInventoryDo = new EquOverhaulInventoryDo();
-            if (queryInventoryDos.stream().noneMatch(a->a.getAccessorycode().equals(inventoryVo.getItem_num()))){
+            List<EquOverhaulInventoryDo> resultInventoryList = queryInventoryDos.stream().filter(p -> p.getAccessorycode().equals(inventoryVo.getItem_num())).collect(Collectors.toList());
+            if (resultInventoryList.size()==0){
                 String uuid = SecurityUtil.getUUID();
                 equOverhaulInventoryDo.setId(uuid);
                 equOverhaulInventoryDo.setAccessory(inventoryVo.getProduct_name());
@@ -83,9 +85,30 @@ public class EquOverhaulInventoryServiceImpl extends ServiceImpl<EquOverhaulInve
                     equOverhaulInventoryDo.setInventorynumber(BigDecimal.valueOf(inventoryVo.getQuantity()));
                 }
                 equOverhaulInventoryDos.add(equOverhaulInventoryDo);
+            }else {
+                equOverhaulInventoryDo.setModifydate(new Date());
+                equOverhaulInventoryDo.setId(resultInventoryList.get(0).getId());
+                equOverhaulInventoryDo.setAccessory(inventoryVo.getProduct_name());
+                equOverhaulInventoryDo.setBelongfactory(inventoryVo.getOrg_name());
+                equOverhaulInventoryDo.setAccessorycode(inventoryVo.getItem_num());
+                equOverhaulInventoryDo.setSpecifications(inventoryVo.getSpec());
+                equOverhaulInventoryDo.setUnit(inventoryVo.getUnit());
+                equOverhaulInventoryDo.setSource(inventoryVo.getCangku());
+                equOverhaulInventoryDo.setBatch(inventoryVo.getBatch_num());
+                List<SysOrganizationVo> resultList = factoryList.stream().filter(p -> p.getFullname().equals(inventoryVo.getOrg_name())).collect(Collectors.toList());
+                equOverhaulInventoryDo.setTenantid(resultList.get(0).getId());
+                if (inventoryVo.getQuantity()!= null){
+                    equOverhaulInventoryDo.setInventorynumber(BigDecimal.valueOf(inventoryVo.getQuantity()));
+                }
+                equOverhaulInventoryDos.add(equOverhaulInventoryDo);
             }
         }
         // 数据保存到库存表中
-        equOverhaulInventoryService.saveBatch(equOverhaulInventoryDos);
+        equOverhaulInventoryService.saveOrUpdateBatch(equOverhaulInventoryDos);
+    }
+
+    @Override
+    public List<EquOverhaulInventoryDo> selectAllInventory() {
+        return equOverhaulInventoryMapperDao.selectAllInventory();
     }
 }

cx-equipment/cx-equipment-common/src/main/resources/mybatis/business/EquOverhaulInventoryDao.xml

@@ -19,4 +19,10 @@
         END;
     </update>
 
+    <select id="selectAllInventory" resultType="com.rongwei.bsentity.domain.EquOverhaulInventoryDo">
+        SELECT *
+        FROM equ_overhaul_inventory
+        where DELETED = 0
+    </select>
+
 </mapper>