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

fix 立库完成指令

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-05-17 19:58:56 +08:00
parent 7364df4a2d
commit 60b5b44e90
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
View File

@@ -10,6 +10,7 @@ import org.nl.acs.device.address.service.AddressService;
import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.ext.wms.AcsUtil; import org.nl.acs.ext.wms.AcsUtil;
import org.nl.acs.ext.wms.RespUtil; import org.nl.acs.ext.wms.RespUtil;
import org.nl.acs.ext.wms.data.UpdateLKTaskRequest; import org.nl.acs.ext.wms.data.UpdateLKTaskRequest;
@@ -46,6 +47,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
private final InstructionService instructionService; private final InstructionService instructionService;
private final DeviceAppService deviceAppService;
private final AcsToWmsService acsToWmsService; private final AcsToWmsService acsToWmsService;
private final AcsToLiKuService acsToLiKuService; private final AcsToLiKuService acsToLiKuService;
@@ -164,6 +167,11 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
inst.setInstruction_status("2"); inst.setInstruction_status("2");
instructionService.finish(inst.getInstruction_id()); instructionService.finish(inst.getInstruction_id());
} else { } else {
Device device = deviceAppService.findDeviceByCode(inst.getNext_device_code());
if(device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver){
inst.setInstruction_status("2");
instructionService.finish(inst.getInstruction_id());
}
inst.setRemark("立库已反馈完成，待输送上报任务号"); inst.setRemark("立库已反馈完成，待输送上报任务号");
instructionService.update(inst); instructionService.update(inst);
} }

1
acs/nladmin-system/src/main/resources/initsql.txt
View File

@@ -14,3 +14,4 @@ delete from sys_quartz_log;
delete from acs_storage_cell; delete from acs_storage_cell;
update acs_stage_actor set device_code='',image_name ='1'; update acs_stage_actor set device_code='',image_name ='1';
update sys_code_rule_detail set current_value=0; update sys_code_rule_detail set current_value=0;
update stage set stage_data = null