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

固化室一键出库

Browse Source
This commit is contained in:
psh
2024-03-25 09:00:33 +08:00
parent 5124b3c782
commit 4787d83f85
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -119,10 +119,13 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
request.setState(String.valueOf(state)); request.setState(String.valueOf(state));
request.setDevice_code(this.getDeviceCode()); request.setDevice_code(this.getDeviceCode());
request.setType("1"); if(state==4){
acsToWmsService.notify(request); request.setType("4");
if(state==4) { acsToWmsService.notify(request);
this. writing(ItemProtocol.item_to_state,4); this.writing(ItemProtocol.item_to_state,4);
}else {
request.setType("1");
acsToWmsService.notify(request);
} }
} }
last_action = action; last_action = action;

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

@@ -200,11 +200,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
List<String> vehicleCodeList = Arrays.stream(schBasePoint.getVehicle_code().split(",")).collect(Collectors.toList()); List<String> vehicleCodeList = Arrays.stream(schBasePoint.getVehicle_code().split(",")).collect(Collectors.toList());
//组盘全部解绑 //组盘全部解绑
for (String vehicleCode : vehicleCodeList) { for (String vehicleCode : vehicleCodeList) {
SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>() List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroupList=vehiclematerialgroupService.list(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode) .eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue())); GroupBindMaterialStatusEnum.BOUND.getValue()));
if (ObjectUtil.isNotEmpty(groupEntity)) { for(SchBaseVehiclematerialgroup groupEntity:schBaseVehiclematerialgroupList){
groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
groupEntity.setUpdate_id(GeneralDefinition.ACS_ID); groupEntity.setUpdate_id(GeneralDefinition.ACS_ID);
groupEntity.setUpdate_name(GeneralDefinition.ACS_NAME); groupEntity.setUpdate_name(GeneralDefinition.ACS_NAME);