root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 合并冲突

Browse Source
This commit is contained in:
liyongde
2023-08-16 17:15:38 +08:00
parent 40946aa2d6 a079dd9058
commit e6fccdffd4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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