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

add：添加激光下料导入工单功能,单工任务类型改成12(由右先取)

Browse Source
This commit is contained in:
zhangzq
2024-07-11 10:12:37 +08:00
parent cb3c92b841
commit d604552b9a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java
View File

@@ -91,7 +91,7 @@ public enum AcsTaskEnum {
AGV_SYSTEM_HR("3","海柔任务"), AGV_SYSTEM_HR("3","海柔任务"),
ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"),
ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_TASK("12","诺宝单工任务"),
ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"), ACS_TASK_TYPE_NOBLE_SINGLE_ENTRY_TASK("3","诺宝单入-单任务"),
ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_ENTRY_TASK("4","诺宝双入-双任务"),

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -655,9 +655,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
} }
if (j == 4) { if (j == 4) {
//设备 A1_TW_ //设备 A1_TW_
String s = col.replaceAll("-", "_"); if (StringUtils.isNotEmpty(col)) {
if (StringUtils.isNotEmpty(s)) { workorder.setDevice_code(col);
workorder.setDevice_code("A1_TW_" + s);
} }
} }
if (j == 7) { if (j == 7) {
@@ -709,6 +708,13 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
errorMap.put("第" + (i + 1) + "行:", "工序名称:" + workorder.getWorkprocedure_id() + "不存在"); errorMap.put("第" + (i + 1) + "行:", "工序名称:" + workorder.getWorkprocedure_id() + "不存在");
} else { } else {
workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id()); workorder.setWorkprocedure_id(workprocedure.getWorkprocedure_id());
if (workorder.getWorkprocedure_id().equals("1535144427977314304")){
workorder.setDevice_code("A1_TW_" + workorder.getDevice_code().replaceAll("-", "_"));
}else if (workorder.getWorkprocedure_id().equals("1535143737330634752")){
workorder.setDevice_code("A1_JG_" + workorder.getDevice_code().replaceAll("-", "_"));
}else {
errorMap.put("第" + (i + 1) + "行:", "工序名称:" + workorder.getWorkprocedure_id() + "对应设备不正确");
}
} }
List<MdMeMaterialbase> mdMeMaterialbases = materialspecs.get(workorder.getMaterial_id()); List<MdMeMaterialbase> mdMeMaterialbases = materialspecs.get(workorder.getMaterial_id());
if (!CollectionUtils.isEmpty(mdMeMaterialbases)) { if (!CollectionUtils.isEmpty(mdMeMaterialbases)) {