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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
LENOVO
2024-05-08 17:22:28 +08:00
parent b36299dd56 f35d96317c
commit bd2bc9ba99
6 changed files with 119 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
View File

@@ -291,6 +291,11 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
if (move > 0 && !requireSucess) {
applyLaStrangulationAndLabeling(mode);
}
case 17:
//申请调试贴标
if(move > 0 && !requireSucess){
applyLaStrangulationAndLabeling(mode);
}
break;
}
}
@@ -413,6 +418,8 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
String bindingTemplate = jo.get("bindingTemplate").toString();
String printDevice = jo.get("printDevice").toString();
String bundleTimes = jo.get("bundleTimes").toString();
String case1 = jo.get("case").toString();
String direction = jo.get("direction").toString();
List list = new ArrayList();
if (mode == 10 || mode == 16) {
@@ -521,6 +528,41 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
map12.put("value", labelingTemplate);
list.add(map12);
}
if(mode == 17){
Map map = new HashMap();
map.put("code", "to_length");
map.put("value", length);
list.add(map);
Map map2 = new HashMap();
map2.put("code", "to_weight");
map2.put("value", weight);
list.add(map2);
Map map3 = new HashMap();
map3.put("code", "to_height");
map3.put("value", height);
list.add(map3);
Map map5 = new HashMap();
map5.put("code", "to_command");
map5.put("value", mode);
list.add(map5);
Map map11 = new HashMap();
map11.put("code", "to_binding_times");
map11.put("value", bundleTimes);
list.add(map11);
if(StrUtil.isNotEmpty(case1) && !" ".equals(case1)){
Map map12 = new HashMap();
map12.put("code", "to_binding_times");
map12.put("value", bundleTimes);
list.add(map12);
}
if(StrUtil.isNotEmpty(direction) && !" ".equals(direction)){
Map map13 = new HashMap();
map13.put("code", "to_direction");
map13.put("value", direction);
list.add(map13);
}
}
try {
this.writing(list);
} catch (Exception e) {

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
View File

@@ -21,6 +21,7 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
import org.nl.acs.history.ErrorUtil;
import org.nl.acs.history.service.DeviceErrorLogService;
import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl;
import org.nl.acs.instruction.domain.Instruction;
@@ -1084,7 +1085,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
jo.put("command", command);
jo.put("action", action);
jo.put("task", task);
jo.put("error", this.getError());
jo.put("error", ErrorUtil.getDictDetail("ddj_error_type", String.valueOf(this.getError())));
jo.put("message", LangProcess.msg(message));
jo.put("prohibitInWarehouse", this.prohibitInWarehouse);
jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse);

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java
View File

@@ -66,7 +66,7 @@ public class ErrorUtil {
List<Dict> dictDtos = dictDetailService.queryAll();
for (int i = 0; i < dictDtos.size(); i++) {
Dict dictDto = dictDtos.get(i);
dictMap.put(dictDto.getName(), getDict(dictDto.getName(), dictDetailService::getDictByName));
dictMap.put(dictDto.getCode(), getDict(dictDto.getCode(), dictDetailService::getDictByName));
}
}
}