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

更新

Browse Source
This commit is contained in:
gengby
2022-11-24 18:12:10 +08:00
parent a27451e804
commit 7d25ea606c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -388,6 +388,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
Integer now_need_emptypallet_num = Integer.parseInt(taskService.findByCode(dto.getTask_code()).getEmptypallet_num()); Integer now_need_emptypallet_num = Integer.parseInt(taskService.findByCode(dto.getTask_code()).getEmptypallet_num());
//当前叠盘架有空托盘数量 //当前叠盘架有空托盘数量
int now_number = emptyVehicleStackingPositionDeviceDriver.getNumber(); int now_number = emptyVehicleStackingPositionDeviceDriver.getNumber();
if (now_number == 0){
now_number = 1;
}
//判断从第几层取 //判断从第几层取
int i = now_number - now_need_emptypallet_num - emptyNum + 1; int i = now_number - now_need_emptypallet_num - emptyNum + 1;
if (i <= 0) { if (i <= 0) {

2
acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
View File

@@ -291,6 +291,7 @@ public class HFHandServiceImpl implements HFHandService {
String task_type = jsonObject.get("task_type"); String task_type = jsonObject.get("task_type");
String priority = jsonObject.get("priority"); String priority = jsonObject.get("priority");
String carrier = jsonObject.get("carrier"); String carrier = jsonObject.get("carrier");
String emptypallet_num = jsonObject.get("emptypallet_num");
JSONObject resultJson = new JSONObject(); JSONObject resultJson = new JSONObject();
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -363,6 +364,7 @@ public class HFHandServiceImpl implements HFHandService {
dto.setTask_type(task_type); dto.setTask_type(task_type);
dto.setPriority(priority); dto.setPriority(priority);
dto.setVehicle_code(carrier); dto.setVehicle_code(carrier);
dto.setEmptypallet_num(emptypallet_num);
try { try {
taskService.create(dto); taskService.create(dto);
// startDevice.setIslock("true"); // startDevice.setIslock("true");