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

rev：手持通用功能、小料箱功能测试修改

Browse Source
This commit is contained in:
liuxy
2025-09-17 10:00:26 +08:00
parent 40a1298ae9
commit 78411c83b7
12 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
View File

@@ -83,7 +83,7 @@ public class GroupController {
}
@PostMapping("/copySave")
@Log("查询供应商")
@Log("复制新增")
public ResponseEntity<Object> copySave(@RequestBody GroupPlate dto) {
iMdPbGroupplateService.create(dto);
return new ResponseEntity<>(HttpStatus.OK);

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

@@ -91,7 +91,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ResultAcsStatus.EXECUTING.getCode().equals(acs_task_status)) {
// 执行中
status = TaskStatus.EXECUTING;
// 更新车号
} else if (ResultAcsStatus.FINISHED.getCode().equals(acs_task_status)) {
// 完成
status = TaskStatus.FINISHED;

14
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java
View File

@@ -37,49 +37,49 @@ public class PdaGeneralPublicController {
@Log("查询品质类型")
@SaIgnore
public ResponseEntity<Object> queryGroupQuality() {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupQuality()), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryGroupQuality(), HttpStatus.OK);
}
@PostMapping("/queryMaterial")
@Log("查询物料")
@SaIgnore
public ResponseEntity<Object> queryMaterial(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryMaterial(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryMaterial(whereJson), HttpStatus.OK);
}
@PostMapping("/querySupp")
@Log("查询供应商")
@SaIgnore
public ResponseEntity<Object> querySupp(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.querySupp(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.querySupp(whereJson), HttpStatus.OK);
}
@PostMapping("/queryBoxType")
@Log("查询料箱类型")
@SaIgnore
public ResponseEntity<Object> queryBoxType() {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBoxType()), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryBoxType(), HttpStatus.OK);
}
@PostMapping("/queryGroupInfo")
@Log("查询组盘记录")
@SaIgnore
public ResponseEntity<Object> queryGroupInfo(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupInfo(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryGroupInfo(whereJson), HttpStatus.OK);
}
@PostMapping("/queryBomInfo")
@Log("查询工单信息")
@SaIgnore
public ResponseEntity<Object> queryBomInfo(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBomInfo(whereJson)), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryBomInfo(whereJson), HttpStatus.OK);
}
@PostMapping("/queryVehicleType")
@Log("查询载具类型")
@SaIgnore
public ResponseEntity<Object> queryVehicleType() {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryVehicleType()), HttpStatus.OK);
return new ResponseEntity<>(pdaGeneralPublicService.queryVehicleType(), HttpStatus.OK);
}
}

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java
View File

@@ -55,6 +55,11 @@ public class PdaUpdatePointServiceImpl implements PdaUpdatePointService {
}
SchBasePoint pointDao = schBasePointMapper.selectById(whereJson.getString("point_code"));
// 判断当前点位是否已经有载具
if (ObjectUtil.isNotEmpty(pointDao.getVehicle_code())) {
throw new BadRequestException("当前点位已存在载具!【"+pointDao.getVehicle_code()+"】");
}
pointDao.setVehicle_code(whereJson.getString("storagevehicle_code"));
schBasePointMapper.updateById(pointDao);
return PdaResponse.requestOk();

4
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/smallbox_management/controller/PdaSmallBoxPublicController.java
View File

@@ -44,13 +44,13 @@ public class PdaSmallBoxPublicController {
@Log("查询库区")
@SaIgnore
public ResponseEntity<Object> querySectCode() {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaSmallBoxPublicService.querySectCode()), HttpStatus.OK);
return new ResponseEntity<>(pdaSmallBoxPublicService.querySectCode(), HttpStatus.OK);
}
@PostMapping("/queryInBillType")
@Log("查询入库业务类型")
@SaIgnore
public ResponseEntity<Object> queryInBillType() {
return new ResponseEntity<>(PdaResponse.requestParamOk(pdaSmallBoxPublicService.queryInBillType()), HttpStatus.OK);
return new ResponseEntity<>(pdaSmallBoxPublicService.queryInBillType(), HttpStatus.OK);
}
}

6
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java
View File

@@ -238,12 +238,6 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
if (acsResponse.getStatus() != 200) {
throw new BadRequestException(acsResponse.getMessage());
}
// 清空点位信息
pointDao.setVehicle_code("");
pointDao.setPoint_status(IOSEnum.POINT_STATUS.code("空位"));
pointDao.setIng_task_code("");
this.updateById(pointDao);
}
@Override

5
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/DetainInTask.java
View File

@@ -160,10 +160,7 @@ public class DetainInTask extends AbstractTask {
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
rawAssistIStorService.taskFinish(taskObj);
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark("已完成");
taskService.updateById(taskObj);
this.finishTask(taskObj);
}
@Override

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/VehicleOutServiceImpl.java
View File

@@ -128,6 +128,13 @@ public class VehicleOutServiceImpl implements VehicleOutService {
throw new BadRequestException("暂时没有可用的空载具!");
}
// 锁定仓位
iStructattrService.update(
new UpdateWrapper<Structattr>().lambda()
.set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("空托盘出库锁"))
.eq(Structattr::getStruct_code, structattr.getStruct_code())
);
// 创建任务
JSONObject jsonTask = new JSONObject();
jsonTask.put("point_code1", structattr.getStruct_code());