|
@ -44,10 +44,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
import javax.annotation.PostConstruct; |
|
|
import javax.annotation.PostConstruct; |
|
|
import java.lang.reflect.InvocationTargetException; |
|
|
import java.lang.reflect.InvocationTargetException; |
|
|
import java.lang.reflect.Method; |
|
|
import java.lang.reflect.Method; |
|
|
import java.util.Arrays; |
|
|
import java.util.*; |
|
|
import java.util.HashMap; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.concurrent.ConcurrentHashMap; |
|
|
import java.util.concurrent.ConcurrentHashMap; |
|
|
import java.util.concurrent.TimeUnit; |
|
|
import java.util.concurrent.TimeUnit; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
@ -197,7 +194,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { |
|
|
List<SchBasePoint> schBasePointList = schBasePointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>() |
|
|
List<SchBasePoint> schBasePointList = schBasePointMapper.selectList(new LambdaQueryWrapper<SchBasePoint>() |
|
|
.like(SchBasePoint::getPoint_code, ghs_device_code)); |
|
|
.like(SchBasePoint::getPoint_code, ghs_device_code)); |
|
|
for (SchBasePoint schBasePoint : schBasePointList) { |
|
|
for (SchBasePoint schBasePoint : schBasePointList) { |
|
|
List<String> vehicleCodeList = Arrays.stream(schBasePoint.getVehicle_code().split(",")).collect(Collectors.toList()); |
|
|
List<String> vehicleCodeList=new ArrayList<>(); |
|
|
|
|
|
if(ObjectUtil.isNotEmpty(schBasePoint.getVehicle_code())) { |
|
|
|
|
|
vehicleCodeList = Arrays.stream(schBasePoint.getVehicle_code().split(",")).collect(Collectors.toList()); |
|
|
|
|
|
} |
|
|
//组盘全部解绑
|
|
|
//组盘全部解绑
|
|
|
for (String vehicleCode : vehicleCodeList) { |
|
|
for (String vehicleCode : vehicleCodeList) { |
|
|
List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroupList=vehiclematerialgroupService.list(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>() |
|
|
List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroupList=vehiclematerialgroupService.list(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>() |
|
|