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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-07-23 22:24:41 +08:00
parent cb301f3499
commit 59a308119a
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_emptypallet_site/StandardEmptyPalletSiteDeviceDriver.java
View File

@@ -191,13 +191,13 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver
log.debug("设备运转模式:等待工作");
return;
case 2:
if (!requireSucess){
if (move > 0) {
this.execute_log.log("设备:" + devicecode + ",move:" + move);
this.apply_take_empty(container);
}
}
/* String apply_task ="";
// if (!requireSucess){
// if (move > 0) {
// this.execute_log.log("设备:" + devicecode + ",move:" + move);
// this.apply_take_empty(container);
// }
// }
String apply_task ="";
if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("apply_task"))) {
apply_task = this.getDevice().getExtraValue().get("apply_task").toString();
}
@@ -241,7 +241,7 @@ public class StandardEmptyPalletSiteDeviceDriver extends AbstractOpcDeviceDriver
}
}
}*/
}
break;
default:

5
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -577,6 +577,11 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
if (standardEmptyPalletSiteDeviceDriver.getMove() != 1 || standardEmptyPalletSiteDeviceDriver.getNumber() == 0) {
continue;
}
int max_emptypalletnum = Integer.parseInt(route_link_device.getExtraValue().get("max_emptypalletnum").toString());
if(standardEmptyPalletSiteDeviceDriver.getNumber() >= max_emptypalletnum ){
continue;
}
//判断是否已经有该起点设备的任务,如果有就结束循环
int num = taskserver.querySameOriginTask(start_device_code);
if (num != 0) {

7
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -194,7 +194,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
if (nextdevice.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver){
standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) nextdevice.getDeviceDriver();
int number = standardEmptyPalletSiteDeviceDriver.getNumber();
if (number == standardEmptyPalletSiteDeviceDriver.getMax_emptypalletnum()){
if (number >= standardEmptyPalletSiteDeviceDriver.getMax_emptypalletnum()){
continue;
}
//判断是否已经有该起点设备的任务,如果有就结束循环
@@ -377,12 +377,13 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
dto.setStart_device_code(this.getDevice().getDevice_code());
dto.setVehicle_code("");
dto.setVehicle_type("");
dto.setMaterial(material);
dto.setRoute_plan_code("normal");
String taskcode = CodeUtil.getNewCode("TASK_NO");
dto.setTask_code("-" + taskcode);
dto.setTask_status("0");
dto.setPriority("101");
dto.setMaterial(this.getDevice().getMaterial_type());
//dto.setMaterial(this.getDevice().getMaterial_type());
dto.setQuantity(new BigDecimal(this.getQty()));
RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
String next_device_codecode = jo.getNext_device_code();
@@ -399,7 +400,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
standardOrdinarySiteDeviceDriver.setPurpose(null);
standardOrdinarySiteDeviceDriver.setRemark(null);
}
dto.setMaterial(this.getDevice().getMaterial_type());
//dto.setMaterial(this.getDevice().getMaterial_type());
dto.setNext_point_code(purpose);
dto.setNext_device_code(purpose);
dto.setUpdate_time(now);

4
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -478,7 +478,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
Device nextdevice = appService.findDeviceByCode(next_device_code);
Device startdevice = appService.findDeviceByCode(start_device_code);
dto.setMaterial(startdevice.getMaterial_type());
if(StrUtil.isEmpty(dto.getMaterial())){
dto.setMaterial(startdevice.getMaterial_type());
}
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver;