diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java index cf7a3b4..b517702 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java @@ -31,6 +31,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.*; @@ -42,19 +43,19 @@ import java.util.*; @RequiredArgsConstructor public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired + AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - @Autowired + DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); //工作模式 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index 3f26623..d88445c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -29,6 +29,7 @@ import org.nl.acs.task.service.TaskService; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.Date; import java.util.HashMap; @@ -43,21 +44,21 @@ import java.util.Map; @RequiredArgsConstructor public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired + AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - @Autowired + ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean("produceshiftorderServiceImpl"); - @Autowired + DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index 461b825..1123807 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -31,6 +31,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.*; @@ -42,17 +43,17 @@ import java.util.*; @RequiredArgsConstructor public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired + InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - @Autowired + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - @Autowired + TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired + AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl"); - @Autowired + DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppServiceImpl.class); //当前指令1 @@ -227,6 +228,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev this.writing("to_onset1", "0"); this.writing("to_target1", "0"); this.writing("to_task1", "0"); + this.setRequireHeadSucess(false); } } } @@ -270,6 +272,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev this.writing("to_onset2", "0"); this.writing("to_target2", "0"); this.writing("to_task2", "0"); + this.setRequireBackSucess(false); } } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java index 77b824c..6ace636 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java @@ -28,6 +28,7 @@ import org.nl.wms.util.IdUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -427,6 +428,9 @@ public class HnjSendMaterialTask extends AbstractAcsTask { taskTab.insert(emptyJson); JSONObject fullJson = JSONObject.parseObject(JSON.toJSONString(fullDto)); taskTab.insert(fullJson); + int real_qty = workOrderObj.getIntValue("real_qty"); + workOrderObj.put("real_qty", ++real_qty); + workOrderTab.update(workOrderObj); //创建好立即下发 this.immediateNotifyAcs(); diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index a386ee9..652e332 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -296,6 +296,7 @@ + -