diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls b/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls deleted file mode 100644 index 2f6967a2..00000000 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls and /dev/null differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls index ec750681..490d5c3a 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index c3a522e9..52df3b86 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index cc3137da..29438994 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java index 2681f60b..b7d9b8a6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java @@ -34,6 +34,7 @@ import java.util.stream.Collectors; * 1、比如要N个空箱子或N个满料料箱。查询出来以后,一个码都无法扫描出来,这时候标记这些箱子为异常 * 2、箱码扫描不出来,则用手持经过WMS中转传输给WCS,最后给电器。 * 3、AGV搬运过程中异常(非AGVERR),查询条件为设备、起始点等未完成的时候(有可能不是异常)。 + * * @date 2023/3/22 */ @Service @@ -141,10 +142,11 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ SpeMachineryTask SpeMachineryTask = new SpeMachineryTask(); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); JSONObject taskObject = taskTab.query("task_id =" + param.getString("instruct_uuid")).uniqueResult(0); - //01-取消、02-完成、03-重发,根据操作类型执行相关操作 + //01-取消、02-完成、03-任务下发,根据操作类型执行相关操作 if("01".equals(optType) || "02".equals(optType)) { updateTaskStatus(taskObject, optType); } + //任务下发 if("03".equals(optType)) { SpeMachineryTask.createTask(taskObject); } @@ -165,7 +167,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{ } @Override - public Object cacheLineMaterCheck() { + public Object cacheLineMaterCheck() { WQLObject positionTab = WQLObject.getWQLObject("sch_cacheline_position"); JSONArray positionArr = positionTab.query("is_delete = '0'").getResultJSONArray(0); // 缓存线位置表 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index b558de70..82a40428 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 7df0c7d0..7c7bbc47 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ