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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2025-08-05 18:01:41 +08:00
parent 56434a5a25 752e8d1e5b
commit aeb1fca18e
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/controller/PdaIosInController.java
View File

@@ -176,7 +176,7 @@ public class PdaIosInController {
@PostMapping("vehicleInConfirm") @PostMapping("vehicleInConfirm")
@Log("空载具入库") @Log("空载具入库")
public ResponseEntity<Object> vehicleInConfirm(@RequestBody JSONObject whereJson) { public ResponseEntity<Object> vehicleInConfirm(@RequestBody JSONObject whereJson) {
assertNotBlankJson(whereJson, "请求参数不能为空", "sect_code", "vehicle_code", "site_code"); assertNotBlankJson(whereJson, "请求参数不能为空", "sect_code", "vehicle_code");
return new ResponseEntity<>(pdaIosInService.vehicleInConfirm(whereJson), HttpStatus.OK); return new ResponseEntity<>(pdaIosInService.vehicleInConfirm(whereJson), HttpStatus.OK);
} }
} }

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

@@ -403,11 +403,35 @@ public class PdaIosInServiceImpl implements PdaIosInService {
} }
whereJson.put("stor_id",sectattr.getStor_id()); whereJson.put("stor_id",sectattr.getStor_id());
whereJson.put("qty", 1); whereJson.put("qty", 1);
String materialCode = StatusEnum.VEHICLE_TYPE.code("空托盘");
whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode,false).getMaterial_id()); //得到当前点位的载具编号
whereJson.put("material_code", materialCode); List<SchBasePoint> schBasePointList = iSchBasePointService.list(new LambdaQueryWrapper<SchBasePoint>()
whereJson.put("pcsn","空托盘入库"); .eq(SchBasePoint::getVehicle_code, whereJson.getString("vehicle_code")));
if(CollectionUtils.isEmpty(schBasePointList)){
throw new BadRequestException("载具不在点位上");
}
if(schBasePointList.size()>1){
throw new BadRequestException("存在重复点位，请确认");
}
whereJson.put("site_code",schBasePointList.get(0).getPoint_code());
MdPbStoragevehicleinfo vehicleDao = iMdPbStoragevehicleinfoService.getByCode(whereJson.getString("vehicle_code"));
if (ObjectUtil.isEmpty(vehicleDao) || StringUtils.isBlank(vehicleDao.getStoragevehicle_name())) {
throw new BadRequestException("载具信息有误!");
}
if (vehicleDao.getStoragevehicle_name().contains("托盘")) {
String materialCode = StatusEnum.VEHICLE_TYPE.code("空托盘");
whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id());
whereJson.put("material_code", materialCode);
whereJson.put("pcsn", "空托盘入库");
} else {
String materialCode = StatusEnum.VEHICLE_TYPE.code("空料桶");
whereJson.put("material_id", iMdMeMaterialbaseService.getByCode(materialCode, false).getMaterial_id());
whereJson.put("material_code", materialCode);
whereJson.put("pcsn", "空料桶入库");
}
//组盘 //组盘
groupPlate(whereJson); groupPlate(whereJson);
// 生成空载具入库任务 // 生成空载具入库任务
@@ -503,7 +527,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
} else { } else {
//空载具入库 //空载具入库
whereJson.put("qty", 1); whereJson.put("qty", 1);
String materialCode = "1".equals(whereJson.getString("material_id")) ? StatusEnum.VEHICLE_TYPE.code("空托盘") : StatusEnum.VEHICLE_TYPE.code("空料箱"); String materialCode = "1".equals(whereJson.getString("material_id")) ? StatusEnum.VEHICLE_TYPE.code("空托盘") : StatusEnum.VEHICLE_TYPE.code("空料桶");
whereJson.put("material_id", materialCode); whereJson.put("material_id", materialCode);
//组盘 //组盘
groupPlate(whereJson); groupPlate(whereJson);

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

@@ -248,7 +248,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
if (qty > 6) { if (qty > 6) {
throw new BadRequestException("一次性只能输入小于7以内的载具数量"); throw new BadRequestException("一次性只能输入小于7以内的载具数量");
} }
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料箱")); queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料桶"));
} else { } else {
queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘")); queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘"));
} }