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

opt:分支合并

Browse Source
This commit is contained in:
zhangzhiqiang
2023-09-20 16:31:09 +08:00
parent 7f142e1e91
commit 6308d6ba37
91 changed files with 234 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: prod
active: dev3
jackson:
time-zone: GMT+8
data:
@@ -12,7 +12,7 @@ spring:
task:
pool:
# 核心线程池大小
core-pool-size: 10
core-pool-size: 10pcsIfPurchaseorder/confirm
# 最大线程数
max-pool-size: 30
# 活跃时间

113
mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql
View File

@@ -428,44 +428,44 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX
-- 制造订单视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pcs_sale_order_view` AS SELECT
*
*
FROM
`mps_sale_order`
`mps_sale_order`
WHERE
( `mps_sale_order`.`aps_status` <> 'B' );
( `mps_sale_order`.`aps_status` <> 'B' );
-- ----------------------------
-- 原材料视图
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW
`hl_one_lms`.`pcs_if_purchaseorder_create_view` AS SELECT
*
*
FROM
`pcs_if_demandorder`
WHERE
( `pcs_if_demandorder`.`create_mode` = '03' );
-- ----------------------------
-- 在途库存视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pcs_if_purchaseorder_view` AS SELECT
*
*
FROM
`pcs_if_purchaseorder`
WHERE
(
`pcs_if_purchaseorder`.`status` = '30');
-- ----------------------------
-- 生产日历视图
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bi_factorycalendardtl_view` AS SELECT
`d`.`factorycalendardtl_id` AS `factorycalendardtl_id`,
`d`.`factorycalendar_id` AS `factorycalendar_id`,
@@ -474,52 +474,52 @@ CREATE
`d`.`work_type` AS `work_type`,
`d`.`work_type_name` AS `work_type_name`,
`d`.`resource` AS `resource`,
`d`.`priority` AS `priority`
`d`.`priority` AS `priority`
FROM
(
`pdm_bi_factorycalendardtl` `d`
LEFT JOIN `pdm_bi_factorycalendar` `f` ON ((
`d`.`factorycalendar_id` = `f`.`factorycalendar_id`
)))
`d`.`factorycalendar_id` = `f`.`factorycalendar_id`
)))
WHERE
((
`d`.`work_type` = '01'
)
`d`.`work_type` = '01'
)
AND ((
`f`.`is_active` = 1
)
`f`.`is_active` = 1
)
OR ( `d`.`factorycalendardtl_id` = '1' )));
-- ----------------------------
-- 原料库存视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`st_ivt_structivt_yl_view` AS SELECT
*
*
FROM
`st_ivt_structivt_yl`;
`st_ivt_structivt_yl`;
-- ----------------------------
-- 半成品库存视图
-- ----------------------------
CREATE
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`st_ivt_structivt_bcp_view` AS SELECT
*
*
FROM
`st_ivt_structivt_bcp`;
`st_ivt_structivt_bcp`;
-- ----------------------------
-- 前段排产BOM视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bom_view_front` AS
SELECT
`pdm_bom`.`bom_status` AS `bom_status`,
@@ -544,24 +544,24 @@ SELECT
`pdm_bi_bomdtl`.`piece_weight` AS `dtl_piece_weight`,
`pdm_bi_bomdtl`.`material_id` AS `material_id`,
`pdm_bi_bomdtl`.`move_expression` AS `move_expression`,
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
FROM
(
`pdm_bi_bom` `pdm_bom`
LEFT JOIN `pdm_bi_bomdtl` `pdm_bi_bomdtl` ON ((
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
)))
WHERE `pdm_bi_bomdtl`.is_front =1 AND pdm_bom.create_mode='03';
-- ----------------------------
-- 后段排产BOM视图
-- ----------------------------
-- ----------------------------
CREATE
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_bom_view_behind` AS
SELECT
`pdm_bom`.`bom_status` AS `bom_status`,
@@ -586,23 +586,23 @@ SELECT
`pdm_bi_bomdtl`.`piece_weight` AS `dtl_piece_weight`,
`pdm_bi_bomdtl`.`material_id` AS `material_id`,
`pdm_bi_bomdtl`.`move_expression` AS `move_expression`,
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
`pdm_bi_bomdtl`.`batch_expression` AS `batch_expression`
FROM
(
`pdm_bi_bom` `pdm_bom`
LEFT JOIN `pdm_bi_bomdtl` `pdm_bi_bomdtl` ON ((
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
`pdm_bom`.`bom_id` = `pdm_bi_bomdtl`.`bom_id`
)))
WHERE `pdm_bi_bomdtl`.is_front =0 AND pdm_bom.create_mode='03';
WHERE `pdm_bi_bomdtl`.is_front =0 AND pdm_bom.create_mode='03';
-- ----------------------------
-- 工单视图
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_produce_workorder_view` AS
-- ----------------------------
CREATE
OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root` @`localhost` SQL SECURITY DEFINER VIEW `hl_one_lms`.`pdm_produce_workorder_view` AS
SELECT
`pdm_produce_workorder_aps`.`workorder_id` AS `workorder_id`,
`pdm_produce_workorder_aps`.`workorder_code` AS `workorder_code`,
@@ -652,12 +652,12 @@ SELECT
`pdm_produce_workorder_aps`.`update_id` AS `update_id`,
`pdm_produce_workorder_aps`.`update_name` AS `update_name`,
`pdm_produce_workorder_aps`.`update_time` AS `update_time`,
`pdm_produce_workorder_aps`.`material_code` AS `material_code`
`pdm_produce_workorder_aps`.`material_code` AS `material_code`
FROM
`pdm_produce_workorder_aps`;
DELETE FROM `sys_dict` WHERE code = 'PCS_SALE_STATUS';
DELETE FROM `sys_dict` WHERE code = 'PCS_SALE_STATUS';
INSERT INTO `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 ('A1_XY_80_5', 'A1_旋压下料_80_5', 'A1', '1535144356586165920', NULL, NULL, NULL, NULL, 150, 150, 1200, 150, 150, 0, NULL, 150, 0, NULL, NULL, '1', '管理员', '2023-05-18 17:20:58', NULL, NULL, NULL, 0, 0, NULL, '28', NULL, NULL);
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1701861908820398080', 'WORKORDER_CREATE_TYPE', '工单创建类型', 'APS创建', '3', 3, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-13 15:34:32', '1694303357524643840', '管理员', '2023-09-13 15:34:32');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1682657446490935296', 'PURCHASE_STATUS', '原料需求单据状态', '生成', '10', 0, NULL, NULL, NULL, NULL, '1', '管理员', '2023-07-22 15:42:52', '1', '管理员', '2023-07-22 15:43:10');
@@ -668,7 +668,7 @@ INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('432', 'PCS_SALE_STATUS', '销售订单状态', '生成', '1', 1, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/1 0:00', '1', '管理员', '2023-08-21 20:40:34');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('433', 'PCS_SALE_STATUS', '销售订单状态', '前段提交', '2', 2, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/2 0:00', '1', '管理员', '2023-08-21 20:40:37');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('434', 'PCS_SALE_STATUS', '销售订单状态', '后段提交', '3', 3, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/3 0:00', '1', '管理员', '2023-08-21 20:40:40');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('435', 'PCS_SALE_STATUS', '销售订单状态', '确认', '5', 5, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/4 0:00', '1', '管理员', '2023-08-21 20:40:49');
INSERT INTO `sys_dict` (`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('435', 'PCS_SALE_STATUS', '销售订单状态', '确认', '5', 5, NULL, NULL, NULL, NULL, NULL, NULL, '1900/1/4 0:00', '1', '管理员', '2023-08-21 20:40:49');
-- ----------------------------
-- Table structure for md_me_materialbase
@@ -38654,3 +38654,6 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX
SET FOREIGN_KEY_CHECKS = 1;
update md_me_materialbase set material_type_id = '' where material_type_id = '1638127956159238144';
update md_me_materialbase set base_unit_id = '1', assist_unit_id = '1' where material_code like '10100%';