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

fix:优化

Browse Source
This commit is contained in:
zhengxuming
2025-08-14 10:28:59 +08:00
parent fc1f1dee4d
commit 014861ce99
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java
View File

@@ -528,6 +528,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
param.put("site_code",dto.getDevice_code()); param.put("site_code",dto.getDevice_code());
param.put("sect_id",sectattr.getSect_id()); param.put("sect_id",sectattr.getSect_id());
param.put("sect_code",sectattr.getSect_code()); param.put("sect_code",sectattr.getSect_code());
param.put("back_material_flag",true);
pdaIosInService.vehicleInConfirm(param); pdaIosInService.vehicleInConfirm(param);
} else{ } else{
throw new BadRequestException("任务类型有误！请传入1或2"); throw new BadRequestException("任务类型有误！请传入1或2");

10
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -566,8 +566,11 @@ public class PdaIosInServiceImpl implements PdaIosInService {
public PdaResponse vehicleInConfirm(JSONObject whereJson) { public PdaResponse vehicleInConfirm(JSONObject whereJson) {
//空载具入库 //空载具入库
Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code")); Sectattr sectattr = sectattrService.findById(whereJson.getString("sect_code"));
if(sectattr == null){ if (sectattr == null) {
throw new BadRequestException("库区" + whereJson.getString("sect_code") +"不存在"); sectattr = sectattrService.findByCode(whereJson.getString("sect_code"));
if (sectattr == null) {
throw new BadRequestException("库区" + whereJson.getString("sect_code") + "不存在");
}
} }
whereJson.put("sect_code", sectattr.getSect_code()); whereJson.put("sect_code", sectattr.getSect_code());
@@ -588,7 +591,8 @@ public class PdaIosInServiceImpl implements PdaIosInService {
if(schBasePointList.size()>1){ if(schBasePointList.size()>1){
throw new BadRequestException("存在重复点位，请确认"); throw new BadRequestException("存在重复点位，请确认");
} }
if(!"2".equals(schBasePointList.get(0).getPoint_status())){ if(!"2".equals(schBasePointList.get(0).getPoint_status())
&& !whereJson.containsKey("back_material_flag")){
throw new BadRequestException("点位状态不为空载具，请核对！"); throw new BadRequestException("点位状态不为空载具，请核对！");
} }