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

fix: 装箱修改

Browse Source
This commit is contained in:
ls
2026-01-16 09:02:21 +08:00
parent 16f0b7a285
commit 38cd317d85
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
View File

@@ -553,11 +553,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map12.put("value", interactionJsonDTO.getFrpModel()); map12.put("value", interactionJsonDTO.getFrpModel());
list.add(map12); list.add(map12);
} }
// if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) { if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
// map13.put("code", "to_have_or_not"); map13.put("code", "to_have_or_not");
// map13.put("value", interactionJsonDTO.getIsHave()); map13.put("value", interactionJsonDTO.getIsHave());
// list.add(map13); list.add(map13);
// } }
} }
this.writing(list); this.writing(list);
luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder()

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java
View File

@@ -260,6 +260,7 @@ public class ItemProtocol {
list.add(new ItemDto(item_to_len, "下发子卷长度", "DB2.W16")); list.add(new ItemDto(item_to_len, "下发子卷长度", "DB2.W16"));
list.add(new ItemDto(item_to_barcode, "下发木箱条码", "DB601.STRING1.50")); list.add(new ItemDto(item_to_barcode, "下发木箱条码", "DB601.STRING1.50"));
list.add(new ItemDto(item_frpModel, "下发管芯尺寸", "DB601.STRING1.50")); list.add(new ItemDto(item_frpModel, "下发管芯尺寸", "DB601.STRING1.50"));
list.add(new ItemDto(item_to_have_or_not, "下发是否有子卷", "DB601.STRING1.50"));
return list; return list;
} }
} }

1
acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue
View File

@@ -173,6 +173,7 @@
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" /> <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" /> <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" /> <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
<el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" /> <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" /> <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" /> <el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />