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

opt: 贴标捆扎位优化

Browse Source
This commit is contained in:
yanps
2024-05-18 09:05:55 +08:00
parent 6ad2cc8493
commit 50e964fe8f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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

@@ -322,7 +322,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
} else {
this.require_apply_strangulation_time = date;
Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task));
if (StrUtil.isEmpty(inst.getVehicle_code())) {
if (ObjectUtil.isEmpty(inst) && StrUtil.isEmpty(inst.getVehicle_code())) {
message = LangProcess.msg("one_message8") + ": " + task + LangProcess.msg("one_message11");
return;
}
@@ -530,11 +530,11 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
map12.put("value", labelingTemplate);
Map map13 = new HashMap();
map13.put("code", "to_leight");
map13.put("code", "to_length");
map13.put("value", length);
list.add(map13);
Map map14 = new HashMap();
map14.put("code", "to_wedth");
map14.put("code", "to_width");
map14.put("value", width);
list.add(map14);
Map map15 = new HashMap();