From 3aaa8b49440914b4e147ada49d148bb0cb1112de Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sun, 20 Aug 2023 17:38:41 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/controller/TmpKZController.java | 2 -- .../src/main/resources/sql/initsql.sql | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/resources/sql/initsql.sql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java index 531487cd..1ef66170 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java @@ -224,8 +224,6 @@ public class TmpKZController { JSONObject result = wmsToAcsService.request(jo, "api/wms/engravingIn"); if (!result.getString("status").equals("200")){ log.error("刻字上料输送线任务下发异常:{}",result.getString("message")); - baseTask.setRemark(result.getString("message")); - taskService.updateById(baseTask); throw new BadRequestException(result.getString("message")); } }else { diff --git a/mes/hd/nladmin-system/src/main/resources/sql/initsql.sql b/mes/hd/nladmin-system/src/main/resources/sql/initsql.sql new file mode 100644 index 00000000..9bcce2ab --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/sql/initsql.sql @@ -0,0 +1,24 @@ +--设备初始化-- +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_01', '三线刻字包装机01号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_02', '三线刻字包装机02号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_03', '三线刻字包装机03号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_04', '三线刻字包装机04号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_05', '三线刻字包装机05号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_06', '三线刻字包装机06号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_07', '三线刻字包装机07号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_08', '三线刻字包装机08号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_09', '三线刻字包装机09号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_10', '三线刻字包装机10号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_11', '三线刻字包装机11号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); +INSERT INTO `hl_one_mes`.`pdm_bi_device`(`device_code`, `device_name`, `product_area`, `workprocedure_id`, `ext_code`, `material_id`, `workorder_code`, `device_code2`, `inupperlimit_qty`, `inlowerlimit_qty`, `outupperlimit_qty`, `outlowerlimit_qty`, `deviceinitinstor_qty`, `deviceinstor_qty`, `deviceinstor_weight`, `deviceoutstor_qty`, `is_artificial`, `remark`, `cacheLine_code`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`, `is_delete`, `is_used`, `device_icon`, `spec`, `aps_device_code`, `product_series`) VALUES ('A3_KZBZ_12', '三线刻字包装机12号', 'A3', '1689437952540807169', NULL, NULL, NULL, NULL, 1111, 1111, 1111, 1111, 1111, 1111, 0.000, 1111, 0, NULL, NULL, '1', '管理员', '2023-08-11 13:40:57', NULL, NULL, NULL, 0, 1, NULL, NULL, NULL, NULL); + + + + + + + + + + +