修改代码

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

@@ -22,6 +22,7 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.alibaba.fastjson.JSONObject;
@@ -492,23 +493,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 //            list.add(equipmentSpecific);
 //            this.equipmentSpecificIndexSave(equipmentDetail, equipmentSpecific);
 //        }
-            List<Equipment> equipmentList;
-            if (redisUtils.hasKey("equip_equipDefinitions")) {
-                equipmentList = JSONObject.parseArray(redisUtils.get("equip_equipDefinitions").toString(), Equipment.class);;
-            } else {
                 QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
                 equipmentQueryWrapper.isNotNull("id");
-                equipmentList = equipmentMapper.selectList(equipmentQueryWrapper);
-                redisUtils.set("equip_equipDefinitions", JSONObject.toJSONString(equipmentList));
-            }
+            List<Equipment>  equipmentList = equipmentMapper.selectList(equipmentQueryWrapper);
 
-            List<WarehouseStructure> warehouseStructures ;
-            if (redisUtils.hasKey("equip_warehouseStructures")) {
-               warehouseStructures = JSONObject.parseArray(redisUtils.get("equip_warehouseStructures").toString(), WarehouseStructure.class);
-            } else {
-               warehouseStructures = warehouseStructureService.list();
-                redisUtils.set("equip_warehouseStructures", JSONObject.toJSONString(warehouseStructures));
-            }
+            List<WarehouseStructure>    warehouseStructures = warehouseStructureService.list();
             for (int i = 0; i < equipmentDetailDownloadVOS.size(); i++) {
 
                     try {
@@ -728,16 +717,18 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 //                     warehouseStructureQueryWrapper.lambda().eq(WarehouseStructure::getCode, equipmentDetailDownloadVOS.getWarehouseStructCode());
 //                     WarehouseStructure warehouseStructure = warehouseStructureService.getOne(warehouseStructureQueryWrapper);
                  // 入库位置进行优化
-                 WarehouseStructure warehouseStructure = warehouseStructures.stream().filter(x -> x.getCode().equals(equipmentDetailDownloadVOS.getWarehouseStructCode())).collect(Collectors.toList()).get(0);
+                 List<WarehouseStructure> warehouseStructureData = warehouseStructures.stream().filter(x -> x.getCode().equals(equipmentDetailDownloadVOS.getWarehouseStructCode())).collect(Collectors.toList());
 
-                 if (warehouseStructure == null) {
+                 if (ValidationUtil.isEmpty(warehouseStructureData)) {
                      erryy.append(String.format("货位编码[%S]填写错误，请输入正确的货位编码！",equipmentDetailDownloadVOS.getWarehouseStructCode())+ ",");
                      throw new RuntimeException(String.format("货位编码[%S]填写错误，请输入正确的货位编码！",equipmentDetailDownloadVOS.getWarehouseStructCode()));
-                 } else {
-                     equipmentSpecific.setPosition(warehouseStructure.getFullName());
-                     equipmentSpecific.setWarehouseStructureId(warehouseStructure.getId());
-                     equipmentSpecificMapper.updateById(equipmentSpecific);
                  }
+
+                 WarehouseStructure warehouseStructure = warehouseStructureData.get(0);
+                 equipmentSpecific.setPosition(warehouseStructure.getFullName());
+                 equipmentSpecific.setWarehouseStructureId(warehouseStructure.getId());
+                 equipmentSpecificMapper.updateById(equipmentSpecific);
+
                  // 插入库存
                  Stock stock = new Stock();
                  stock.setAmount(Double.valueOf(equipmentSpecific.getNum()));