fix:解决输送线脱机问题
This commit is contained in:
@@ -1279,7 +1279,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
|
||||
if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
|
||||
vehicle_code = inst.getVehicle_code();
|
||||
inst.setExecute_device_code(this.device_code);
|
||||
if (mode == 2) {
|
||||
if (mode == 2 || mode == 0) {
|
||||
finish_instruction();
|
||||
}
|
||||
logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code());
|
||||
|
||||
@@ -650,7 +650,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
|
||||
public HttpResponse taskDeviceUpdate(JSONObject param) {
|
||||
try {
|
||||
MDC.put(log_file_type, log_type);
|
||||
// log.info("shipDeviceUpdate-----输入参数{}", param);
|
||||
// log.info("taskDeviceUpdate-----输入参数{}", param);
|
||||
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
|
||||
String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
|
||||
AddressDto addressDto = addressService.findByCode("taskDeviceUpdate");
|
||||
|
||||
@@ -1007,7 +1007,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
|
||||
continue;
|
||||
}
|
||||
Resp resp = acsToLiKuService.sendInst(task_dto.getStorage_task_type(), inst);
|
||||
|
||||
if (StrUtil.equals(resp.result, "true")) {
|
||||
//创建任务和指令
|
||||
taskService.create(task_dto);
|
||||
|
||||
Reference in New Issue
Block a user