fix: 合并冲突

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -508,8 +508,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(),
                 baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
         if (ObjectUtil.isEmpty(one)) {
-            // 返回400，物料不存在
+            throw new BadRequestException("载具编码为"+baseRequest.getVehicle_code()+"组盘不存在!");
-            throw new BadRequestException("组盘不存在或已静置完成!");
         }
         String yjDeviceCode = basePoint.getParent_point_code(); // 压机设备编码
         // 获取当前工单