Changes

Fixiaobai

2023-11-04 958e45e28ca4f591ab13f2c6f4fe27d57c4880d5

 mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/LocationServiceImpl.java

@@ -29,8 +29,11 @@
import com.chinaztt.ifs.api.feign.IfsFeignClient;
import com.chinaztt.mes.basic.dto.LocationDTO;
import com.chinaztt.mes.basic.dto.LocationIfsMoveDTO;
import com.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.mes.basic.entity.Location;
import com.chinaztt.mes.basic.entity.Warehouse;
import com.chinaztt.mes.basic.excel.LocationData;
import com.chinaztt.mes.basic.mapper.FactoryMapper;
import com.chinaztt.mes.basic.mapper.LocationMapper;
import com.chinaztt.mes.basic.mapper.WarehouseMapper;
import com.chinaztt.mes.basic.service.LocationService;
@@ -46,6 +49,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
 * 库位基础数据
@@ -57,6 +61,7 @@
@AllArgsConstructor
public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService {
   private WarehouseMapper warehouseMapper;
   private FactoryMapper factoryMapper;
   private static final String LOCATION_QC_SEND_BACK = "LOCATION_QC_SEND_BACK";
   public static final String CONTRACT = "IFS_DOMAIN";
   private RemoteParamService remoteParamService;
@@ -87,8 +92,17 @@
      if (CollectionUtil.isEmpty(list)) {
         return;
      }
      List<Factory> factories = factoryMapper.selectList(null);
      List<Warehouse> warehouses = warehouseMapper.selectList(null);
      List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
      for (LocationData data : list) {
         QueryWrapper<Location>QueryWrapper = new QueryWrapper<>();
         QueryWrapper.lambda().eq(Location::getLocNo,data.getLocNo());
         Location location = baseMapper.selectOne(QueryWrapper);
         if(!Objects.isNull(location)){
            log.error("库位编号重复=====》"+data.getLocNo());
            continue;
         }
         Location newLocation = new Location();
         dict.forEach(a->{
            if (a.getLabel().equals(data.getLocType())){
@@ -100,8 +114,24 @@
         }else{
            newLocation.setLocStatus(0);
         }
         newLocation.setFactoryId(data.getFactoryId());
         newLocation.setLocGroup(data.getWarehouseId());
         for (int i = 0; i <factories.size() ; i++) {
            if (factories.get(i).getFactoryName().equals(data.getFactoryName())){
               newLocation.setFactoryId(factories.get(i).getId());
            }
         }
         if (newLocation.getFactoryId()==null){
            log.error("工厂:" + data.getFactoryName() + "不存在");
            continue ;
         }
         for (int i = 0; i <warehouses.size() ; i++) {
            if (warehouses.get(i).getWarehouseName().equals(data.getWarehouseName())){
               newLocation.setLocGroup(warehouses.get(i).getId());
            }
         }
         if (newLocation.getLocGroup()==null){
            log.error("仓库:" + data.getWarehouseName() + "不存在");
            continue ;
         }
         newLocation.setLocName(data.getLocName());
         newLocation.setLocNo(data.getLocNo());
         newLocation.setIfsLocation(data.getIfsLocation());