From 002e48e3121874e88cea57d4f6ab54fb9c7eb535 Mon Sep 17 00:00:00 2001 From: yanghh <1344638791@qq.com> Date: Fri, 16 Jun 2023 14:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dlp_reagent_managment.sql | 101 +++++++++--------- pom.xml | 8 ++ .../ApplicationForUseController.java | 64 +++++++++-- .../controller/InstructionBookController.java | 4 +- .../ReagentConsumableInventoryController.java | 16 ++- .../dto/ApplicationForUseBatchDTO.java | 12 +++ .../reagent/dto/ApplicationForUseDTO.java | 3 + .../reagent/entity/ApplicationForUse.java | 8 +- .../mapper/DetailsOfCentralizedMapper.java | 1 + .../service/ApplicationForUseService.java | 9 ++ .../ReagentConsumableInventoryService.java | 2 + .../impl/ApplicationForUseServiceImpl.java | 78 +++++++++++++- .../impl/ComplianceCheckServiceImpl.java | 3 +- .../impl/DetailsOfCentralizedServiceImpl.java | 76 ++++++------- .../impl/PurchaseCatalogueServiceImpl.java | 2 + .../service/impl/PurchaseListServiceImpl.java | 6 +- ...ReagentConsumableInventoryServiceImpl.java | 8 +- .../StandardReserveSolutionServiceImpl.java | 6 +- .../reagent/task/MaturityCalculation.java | 2 +- src/main/resources/bootstrap.yml | 9 ++ .../mapper/ApplicationForUseMapper.xml | 1 + .../mapper/DetailsOfCentralizedMapper.xml | 59 +++++++++- 22 files changed, 364 insertions(+), 114 deletions(-) create mode 100644 src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java diff --git a/db/dlp_reagent_managment.sql b/db/dlp_reagent_managment.sql index 7b62e1f..2e38c45 100644 --- a/db/dlp_reagent_managment.sql +++ b/db/dlp_reagent_managment.sql @@ -11,7 +11,7 @@ Target Server Version : 50731 File Encoding : 65001 - Date: 14/06/2023 16:28:15 + Date: 16/06/2023 13:59:14 */ SET NAMES utf8mb4; @@ -107,6 +107,7 @@ CREATE TABLE `application_for_use` ( `update_time` datetime(6) NULL DEFAULT NULL COMMENT '--修改时间', `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '--创建人', `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '--修改人', + `template_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `IXFK_application_for_use_requisition_record`(`requisition_record_id`) USING BTREE, CONSTRAINT `FK_application_for_use_requisition_record` FOREIGN KEY (`requisition_record_id`) REFERENCES `requisition_record` (`requisition_record_id`) ON DELETE NO ACTION ON UPDATE NO ACTION @@ -115,34 +116,34 @@ CREATE TABLE `application_for_use` ( -- ---------------------------- -- Records of application_for_use -- ---------------------------- -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:40:42.486000', '1', 1, '16A894BA20C1EDBCCBAA42DF45187C74', 'C0B5D6478C4B7DC96CD2E125F6F9C21F', NULL, '978954', '2023-06-11 15:40:42.477000', '2023-06-11 15:40:42.496000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 15:15:27.468000', '1edaef1e50c39f7ac7530cd98561f943', 2, '18F4E7400401B9B587C7F6AAADB15586', '4C06516FCEBDA30DA2AFDBC6A23C0D77', NULL, '', '2023-05-30 15:15:27.454000', '2023-05-30 15:15:54.568000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 10:42:50.160000', 'BC1A096180973C5EA652C9787F5A155A', 1, '1B8E4B7DA831F40815F7F402B9394F84', '7E8E278C51F499325B27C217D4E30E80', NULL, '683948', '2023-05-30 10:42:50.156000', '2023-05-30 10:42:50.164000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A'); -INSERT INTO `application_for_use` VALUES ('2023-05-31 16:48:36.991000', '1edaef1e50c39f7ac7530cd98561f943', 2, '2743394EBDFD1CF2185DAF29DFA3726E', '8704B98E43D3F1E6B0A4D5CCC1EF7C9A', NULL, '', '2023-05-31 16:48:36.983000', '2023-05-31 16:48:59.908000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:35:55.025000', '1', 1, '39308DFEEAD6DDF075C230CEDDA9B7E7', 'D051FFFFA8C68C526CE61DDABEE34AEA', NULL, '250725', '2023-06-11 15:35:54.982000', '2023-06-11 15:35:55.071000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 10:57:12.458000', '1edaef1e50c39f7ac7530cd98561f943', 1, '3A1FF3EFA6EC378B52AA8995BB79BEA5', 'DB8C59893AED74FF2277EC1CA6EF26CC', NULL, '910684', '2023-05-30 10:57:12.453000', '2023-05-30 10:57:12.465000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 11:39:48.845000', '1edaef1e50c39f7ac7530cd98561f943', 2, '3A880B2F4CAD9883EB9A2C0EF58F4B45', '76076277D5580086054326F3C606C679', NULL, '', '2023-05-30 11:39:48.840000', '2023-05-30 11:40:30.335000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:30:23.203000', '1', 1, '548D263F91B5D5362CEDB14CC9AE6C30', '44EF4673145263A5E539CAB7C292C90E', NULL, '344401', '2023-06-11 15:30:23.152000', '2023-06-11 15:30:23.253000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-29 17:48:29.270000', '1edaef1e50c39f7ac7530cd98561f943', 2, '54DCF6369804BF16A4A7F7C80621BF17', '36CF8014C30EBAED10B3F23B8AA9B7CF', NULL, '', '2023-05-29 17:48:29.263000', '2023-05-29 17:49:22.943000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-05-31 17:17:23.014000', 'C27B8F582693B93596C21C1586A0845A', 1, '5815985B09F10E62A33812E7708F9E28', 'B283E017D88F24F7876513916CABB402', NULL, '006775', '2023-05-31 17:17:23.001000', '2023-05-31 17:17:23.021000', 'C27B8F582693B93596C21C1586A0845A', 'C27B8F582693B93596C21C1586A0845A'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 10:44:55.640000', '1edaef1e50c39f7ac7530cd98561f943', 1, '5AA2A0EEAA7737F8E2E187C1CDC6291A', '814B624CA7520EA79CB0496E4368B3EF', NULL, '464863', '2023-05-30 10:44:55.637000', '2023-05-30 10:44:55.644000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:16.965000', '1', 1, '6B5367184F8464D5D38E4D31DB4A3D46', '288635329B88D7B0668A7E73B7C9C4BE', NULL, '255812', '2023-06-11 15:38:16.926000', '2023-06-11 15:38:17.011000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-31 17:18:02.440000', 'C27B8F582693B93596C21C1586A0845A', 2, '7D3B4B4C8A33A458DAD45D31394C49E6', '77DEB94092FDF1D91A6246196D5CB3AB', NULL, '', '2023-05-31 17:18:02.437000', '2023-05-31 17:30:31.819000', 'C27B8F582693B93596C21C1586A0845A', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-05-31 10:53:14.984000', '1edaef1e50c39f7ac7530cd98561f943', 2, '7DC024FC9BC5156D8DA274FE8F6738E0', '4E1F3AF95611D2FD0ACF8F1ED6163454', NULL, '', '2023-05-31 10:53:14.980000', '2023-05-31 10:53:48.013000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:33.882000', '1', 1, '7EC56EEF71B7C019C9CE53B4E2D971B4', '19DF2557E23798ABC4247BD2EF149683', NULL, '759077', '2023-06-11 15:38:33.874000', '2023-06-11 15:38:33.893000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:22:28.208000', '1', 1, '9DA24E3AB20B42FE4E536BE6690D1015', '163E49BDAD504670191FD399C7A2F81D', NULL, '785133', '2023-06-11 15:22:28.198000', '2023-06-11 15:22:28.220000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:43:07.984000', '1', 2, '9F25C5CCBC6C0E8A953C3B988D66A5A7', 'EF3B9F18851FC1E2F4D9BC223AC0176C', NULL, '', '2023-06-11 15:43:07.980000', '2023-06-11 15:44:47.642000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 11:36:17.457000', '1edaef1e50c39f7ac7530cd98561f943', 1, 'A7E36D381D575FF89364ED9C25A8738F', '71D560A8C4B838F3EC79CBBFCE6BC606', NULL, '694154', '2023-05-30 11:36:17.452000', '2023-05-30 11:36:17.465000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 10:42:24.531000', 'BC1A096180973C5EA652C9787F5A155A', 1, 'AA42C6B2B3B6BBA8D38E92E61F5781D1', 'EDC22F8F3A62602E99B5E873C734E368', NULL, '770452', '2023-05-30 10:42:24.506000', '2023-05-30 10:42:24.549000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A'); -INSERT INTO `application_for_use` VALUES ('2023-05-31 17:32:55.122000', 'C27B8F582693B93596C21C1586A0845A', 2, 'AEEABFFCB67A9C8A37FA3EB701EC4900', '51850B69115E221FC0AB7F22D657B3AB', NULL, '', '2023-05-31 17:32:55.119000', '2023-05-31 17:33:05.090000', 'C27B8F582693B93596C21C1586A0845A', 'C27B8F582693B93596C21C1586A0845A'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:42:16.176000', '1', 1, 'BC31F6C21F90D3BB078015187E88F330', 'F9880D48618EBC1208E9C2C4567BE53F', NULL, '614132', '2023-06-11 15:42:16.171000', '2023-06-11 15:42:16.183000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:39:09.824000', '1', 2, 'C99D72C39081FA8D6AD1B63F27DD4F6E', '3CFF1E382D47AF6CDF7DDCB1DCEB478D', NULL, '', '2023-06-11 15:39:09.816000', '2023-06-11 15:46:23.360000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:41.509000', '1', 1, 'CEC88267E93D062BD0FEC8EC83B2100D', 'E116C43CED4902D7AA8081A5969298B0', NULL, '769563', '2023-06-11 15:38:41.501000', '2023-06-11 15:38:41.520000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 16:28:43.316000', '1edaef1e50c39f7ac7530cd98561f943', 2, 'D39D04F834F65164C9838E1544AC7B0F', 'C837D1460715624599AF1823254B7FAC', NULL, '', '2023-05-30 16:28:43.284000', '2023-05-30 16:29:32.620000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:41:23.761000', '1', 1, 'EC3ADEBD340930DF3E8C8B858B7E0985', 'A5E88594598DFFFE358EBAA5D5418016', NULL, '909162', '2023-06-11 15:41:23.757000', '2023-06-11 15:41:23.766000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:56.181000', '1', 1, 'F13AEBEE9DBE8239331F18AAADA0EB23', '2515E67D23BCD90D5C4DF48AB35FA87C', NULL, '626185', '2023-06-11 15:38:56.174000', '2023-06-11 15:38:56.193000', '1', '1'); -INSERT INTO `application_for_use` VALUES (NULL, '1', 0, 'FC1513C097CDB3FC67A37026A60F4FF0', NULL, NULL, NULL, '2023-06-14 11:02:20.658000', '2023-06-14 11:02:20.658000', '1', '1'); -INSERT INTO `application_for_use` VALUES ('2023-05-30 10:07:24.791000', '1edaef1e50c39f7ac7530cd98561f943', 2, 'FD584A156CA5B6052CE19BA2A0C31F70', 'B7F693330F774012F5B477099E2F2C40', NULL, '', '2023-05-30 10:07:24.783000', '2023-05-30 10:09:47.162000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947'); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:40:42.486000', '1', 1, '16A894BA20C1EDBCCBAA42DF45187C74', 'C0B5D6478C4B7DC96CD2E125F6F9C21F', NULL, '978954', '2023-06-11 15:40:42.477000', '2023-06-11 15:40:42.496000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 15:15:27.468000', '1edaef1e50c39f7ac7530cd98561f943', 2, '18F4E7400401B9B587C7F6AAADB15586', '4C06516FCEBDA30DA2AFDBC6A23C0D77', NULL, '', '2023-05-30 15:15:27.454000', '2023-05-30 15:15:54.568000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 10:42:50.160000', 'BC1A096180973C5EA652C9787F5A155A', 1, '1B8E4B7DA831F40815F7F402B9394F84', '7E8E278C51F499325B27C217D4E30E80', NULL, '683948', '2023-05-30 10:42:50.156000', '2023-05-30 10:42:50.164000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-31 16:48:36.991000', '1edaef1e50c39f7ac7530cd98561f943', 2, '2743394EBDFD1CF2185DAF29DFA3726E', '8704B98E43D3F1E6B0A4D5CCC1EF7C9A', NULL, '', '2023-05-31 16:48:36.983000', '2023-05-31 16:48:59.908000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:35:55.025000', '1', 1, '39308DFEEAD6DDF075C230CEDDA9B7E7', 'D051FFFFA8C68C526CE61DDABEE34AEA', NULL, '250725', '2023-06-11 15:35:54.982000', '2023-06-11 15:35:55.071000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 10:57:12.458000', '1edaef1e50c39f7ac7530cd98561f943', 1, '3A1FF3EFA6EC378B52AA8995BB79BEA5', 'DB8C59893AED74FF2277EC1CA6EF26CC', NULL, '910684', '2023-05-30 10:57:12.453000', '2023-05-30 10:57:12.465000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 11:39:48.845000', '1edaef1e50c39f7ac7530cd98561f943', 2, '3A880B2F4CAD9883EB9A2C0EF58F4B45', '76076277D5580086054326F3C606C679', NULL, '', '2023-05-30 11:39:48.840000', '2023-05-30 11:40:30.335000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:30:23.203000', '1', 1, '548D263F91B5D5362CEDB14CC9AE6C30', '44EF4673145263A5E539CAB7C292C90E', NULL, '344401', '2023-06-11 15:30:23.152000', '2023-06-11 15:30:23.253000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-29 17:48:29.270000', '1edaef1e50c39f7ac7530cd98561f943', 2, '54DCF6369804BF16A4A7F7C80621BF17', '36CF8014C30EBAED10B3F23B8AA9B7CF', NULL, '', '2023-05-29 17:48:29.263000', '2023-05-29 17:49:22.943000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-31 17:17:23.014000', 'C27B8F582693B93596C21C1586A0845A', 1, '5815985B09F10E62A33812E7708F9E28', 'B283E017D88F24F7876513916CABB402', NULL, '006775', '2023-05-31 17:17:23.001000', '2023-05-31 17:17:23.021000', 'C27B8F582693B93596C21C1586A0845A', 'C27B8F582693B93596C21C1586A0845A', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 10:44:55.640000', '1edaef1e50c39f7ac7530cd98561f943', 1, '5AA2A0EEAA7737F8E2E187C1CDC6291A', '814B624CA7520EA79CB0496E4368B3EF', NULL, '464863', '2023-05-30 10:44:55.637000', '2023-05-30 10:44:55.644000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:16.965000', '1', 1, '6B5367184F8464D5D38E4D31DB4A3D46', '288635329B88D7B0668A7E73B7C9C4BE', NULL, '255812', '2023-06-11 15:38:16.926000', '2023-06-11 15:38:17.011000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-31 17:18:02.440000', 'C27B8F582693B93596C21C1586A0845A', 2, '7D3B4B4C8A33A458DAD45D31394C49E6', '77DEB94092FDF1D91A6246196D5CB3AB', NULL, '', '2023-05-31 17:18:02.437000', '2023-05-31 17:30:31.819000', 'C27B8F582693B93596C21C1586A0845A', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-31 10:53:14.984000', '1edaef1e50c39f7ac7530cd98561f943', 2, '7DC024FC9BC5156D8DA274FE8F6738E0', '4E1F3AF95611D2FD0ACF8F1ED6163454', NULL, '', '2023-05-31 10:53:14.980000', '2023-05-31 10:53:48.013000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:33.882000', '1', 1, '7EC56EEF71B7C019C9CE53B4E2D971B4', '19DF2557E23798ABC4247BD2EF149683', NULL, '759077', '2023-06-11 15:38:33.874000', '2023-06-11 15:38:33.893000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:22:28.208000', '1', 1, '9DA24E3AB20B42FE4E536BE6690D1015', '163E49BDAD504670191FD399C7A2F81D', NULL, '785133', '2023-06-11 15:22:28.198000', '2023-06-11 15:22:28.220000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:43:07.984000', '1', 2, '9F25C5CCBC6C0E8A953C3B988D66A5A7', 'EF3B9F18851FC1E2F4D9BC223AC0176C', NULL, '', '2023-06-11 15:43:07.980000', '2023-06-11 15:44:47.642000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 11:36:17.457000', '1edaef1e50c39f7ac7530cd98561f943', 1, 'A7E36D381D575FF89364ED9C25A8738F', '71D560A8C4B838F3EC79CBBFCE6BC606', NULL, '694154', '2023-05-30 11:36:17.452000', '2023-05-30 11:36:17.465000', '1edaef1e50c39f7ac7530cd98561f943', '1edaef1e50c39f7ac7530cd98561f943', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 10:42:24.531000', 'BC1A096180973C5EA652C9787F5A155A', 1, 'AA42C6B2B3B6BBA8D38E92E61F5781D1', 'EDC22F8F3A62602E99B5E873C734E368', NULL, '770452', '2023-05-30 10:42:24.506000', '2023-05-30 10:42:24.549000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-31 17:32:55.122000', 'C27B8F582693B93596C21C1586A0845A', 2, 'AEEABFFCB67A9C8A37FA3EB701EC4900', '51850B69115E221FC0AB7F22D657B3AB', NULL, '', '2023-05-31 17:32:55.119000', '2023-05-31 17:33:05.090000', 'C27B8F582693B93596C21C1586A0845A', 'C27B8F582693B93596C21C1586A0845A', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:42:16.176000', '1', 1, 'BC31F6C21F90D3BB078015187E88F330', 'F9880D48618EBC1208E9C2C4567BE53F', NULL, '614132', '2023-06-11 15:42:16.171000', '2023-06-11 15:42:16.183000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:39:09.824000', '1', 2, 'C99D72C39081FA8D6AD1B63F27DD4F6E', '3CFF1E382D47AF6CDF7DDCB1DCEB478D', NULL, '', '2023-06-11 15:39:09.816000', '2023-06-11 15:46:23.360000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:41.509000', '1', 1, 'CEC88267E93D062BD0FEC8EC83B2100D', 'E116C43CED4902D7AA8081A5969298B0', NULL, '769563', '2023-06-11 15:38:41.501000', '2023-06-11 15:38:41.520000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 16:28:43.316000', '1edaef1e50c39f7ac7530cd98561f943', 2, 'D39D04F834F65164C9838E1544AC7B0F', 'C837D1460715624599AF1823254B7FAC', NULL, '', '2023-05-30 16:28:43.284000', '2023-05-30 16:29:32.620000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:41:23.761000', '1', 1, 'EC3ADEBD340930DF3E8C8B858B7E0985', 'A5E88594598DFFFE358EBAA5D5418016', NULL, '909162', '2023-06-11 15:41:23.757000', '2023-06-11 15:41:23.766000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:56.181000', '1', 1, 'F13AEBEE9DBE8239331F18AAADA0EB23', '2515E67D23BCD90D5C4DF48AB35FA87C', NULL, '626185', '2023-06-11 15:38:56.174000', '2023-06-11 15:38:56.193000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES (NULL, '1', 0, 'FC1513C097CDB3FC67A37026A60F4FF0', NULL, NULL, NULL, '2023-06-14 11:02:20.658000', '2023-06-14 11:02:20.658000', '1', '1', NULL); +INSERT INTO `application_for_use` VALUES ('2023-05-30 10:07:24.791000', '1edaef1e50c39f7ac7530cd98561f943', 2, 'FD584A156CA5B6052CE19BA2A0C31F70', 'B7F693330F774012F5B477099E2F2C40', NULL, '', '2023-05-30 10:07:24.783000', '2023-05-30 10:09:47.162000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL); -- ---------------------------- -- Table structure for batch_details @@ -467,10 +468,10 @@ INSERT INTO `compliance_check` VALUES ('211A3BCBF069F1F68547C3CAE1673247', NULL, INSERT INTO `compliance_check` VALUES ('2689502D3B74A9654AA9346A28667CCE', '2023-05-29 17:52:56.284000', '5FC2CAA8094AF9EC2AC509046DDEBCE0', '', NULL, '1', '1', '2023-05-29 17:53:09.773000', '2023-05-30 17:42:21.759000', '2023-05-29 17:52:56.284000', '合格', 'fdf8547cb203429eed84606be4755ec9', '普通检查', 3, '6dbeaa31c66301796536230d36587145', '2023-05-29 17:49:22.971000', '2023-05-30 17:42:21.761000', 'fa55f4a19a3ac4fec46852d0fe042947', '6dbeaa31c66301796536230d36587145', NULL, 'zzz-2023-6-001', '20mg', NULL, 'panphy', 'B062391CC941FB47A2F2468FEB9A6081', 'fa55f4a19a3ac4fec46852d0fe042947', '去甲奥氮平', 'A42F7B56BBCA6AFE22F242793AEB1141'); INSERT INTO `compliance_check` VALUES ('585617E40D1CACF53FB25E956E4CDD9F', NULL, '5FC2CAA8094AF9EC2AC509046DDEBCE0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '检查', 0, NULL, '2023-05-30 16:29:32.640000', '2023-06-01 11:22:11.827000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', NULL, 'zzz-2023-6-001', '20mg', NULL, 'panphy', 'B062391CC941FB47A2F2468FEB9A6081', NULL, '去甲奥氮平', 'A42F7B56BBCA6AFE22F242793AEB1141'); INSERT INTO `compliance_check` VALUES ('61E1F3B3E93F13676DF069BF47BC1CBD', '2023-06-01 09:53:35.310000', 'F7FB649AA83EF94FA0EFE0ECEA731E19', NULL, NULL, '1', '1', '2023-06-01 09:53:43.611000', '2023-06-01 09:53:51.533000', '2023-06-01 09:53:35.310000', '不合格', 'fdf8547cb203429eed84606be4755ec9', '开始检查', 3, '6dbeaa31c66301796536230d36587145', '2023-05-29 17:49:22.965000', '2023-06-01 09:53:51.533000', 'fa55f4a19a3ac4fec46852d0fe042947', '6dbeaa31c66301796536230d36587145', NULL, NULL, '380ml', '水质不行', '农夫山泉', 'E41C450FF033E1199EF5EF44919F8154', '1edaef1e50c39f7ac7530cd98561f943', '农夫山泉矿泉水', NULL); -INSERT INTO `compliance_check` VALUES ('65DB8F7FC5E4E2AAF57EB28AA24BC386', NULL, '198F0EF9BFBBD0E53AA7AFF3540226A9', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, NULL, '2023-05-30 16:55:18.731000', '2023-05-30 16:55:18.731000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); -INSERT INTO `compliance_check` VALUES ('890F7C487FDD8BC5F1E12DB48C6C3DD5', NULL, 'CE2CCCEE828AE90D51245B014EF3C96E', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, NULL, '2023-05-30 11:40:30.356000', '2023-05-30 11:40:30.356000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, NULL, '380ml', NULL, '农夫山泉', 'E41C450FF033E1199EF5EF44919F8154', NULL, '农夫山泉矿泉水', NULL); +INSERT INTO `compliance_check` VALUES ('65DB8F7FC5E4E2AAF57EB28AA24BC386', NULL, '198F0EF9BFBBD0E53AA7AFF3540226A9', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', 0, NULL, '2023-05-30 16:55:18.731000', '2023-06-15 16:31:28.884000', 'BC1A096180973C5EA652C9787F5A155A', 'fdf8547cb203429eed84606be4755ec9', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); +INSERT INTO `compliance_check` VALUES ('890F7C487FDD8BC5F1E12DB48C6C3DD5', NULL, 'CE2CCCEE828AE90D51245B014EF3C96E', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', 0, NULL, '2023-05-30 11:40:30.356000', '2023-06-15 16:35:34.231000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', NULL, NULL, '380ml', NULL, '农夫山泉', 'E41C450FF033E1199EF5EF44919F8154', NULL, '农夫山泉矿泉水', NULL); INSERT INTO `compliance_check` VALUES ('8B9554E6CA47566EC29DEF011349DF9B', NULL, '1305BB65AC70CFE58D7525681AA51208', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, NULL, '2023-05-30 10:09:47.187000', '2023-05-30 10:09:47.187000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); -INSERT INTO `compliance_check` VALUES ('AB3506BF6EF5D7F63F5C9ABB93E7ACA3', NULL, '198F0EF9BFBBD0E53AA7AFF3540226A9', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, NULL, '2023-05-30 15:15:54.587000', '2023-05-30 15:15:54.587000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); +INSERT INTO `compliance_check` VALUES ('AB3506BF6EF5D7F63F5C9ABB93E7ACA3', NULL, '198F0EF9BFBBD0E53AA7AFF3540226A9', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', 0, NULL, '2023-05-30 15:15:54.587000', '2023-06-15 16:34:00.506000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); INSERT INTO `compliance_check` VALUES ('D5F66A6C9974FFB4944962C1CCE51631', NULL, '198F0EF9BFBBD0E53AA7AFF3540226A9', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '啊', 0, NULL, '2023-05-30 16:55:02.432000', '2023-06-01 11:22:47.230000', 'BC1A096180973C5EA652C9787F5A155A', 'fdf8547cb203429eed84606be4755ec9', NULL, NULL, '350ml', NULL, 'C', '3B0060DD8BA7C61FB237BF83017D294E', NULL, '乙醇', NULL); INSERT INTO `compliance_check` VALUES ('DDF2AB40B2AE1C3E25904D3A55F67389', NULL, '60A1B69839C97B2ED0CC7E11D5EA7F85', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1, NULL, '2023-05-30 11:40:30.349000', '2023-05-30 11:40:30.349000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, 'afdh-2023-6-001', '1mL,1mg/mL于乙腈', NULL, 'Cerilliant', '0199C4BCB3826CA513564CE9B75D412D', NULL, '2-氯地西泮', '2E970A6D2C5ADA59EC20C1E23E385F78'); INSERT INTO `compliance_check` VALUES ('E33FF180396EFF42CDB26501DD57E351', NULL, '0218F092ED3FA010A4461222760EC753', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '啊', 0, NULL, '2023-05-30 15:15:54.598000', '2023-06-01 11:22:59.908000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', NULL, NULL, '300抽', NULL, '雅洁尔', '7E4B948494D4ABD162D0E96D24E3D76C', NULL, '抽纸', NULL); @@ -1242,22 +1243,22 @@ CREATE TABLE `reagent_consumable_inventory` ( -- ---------------------------- -- Records of reagent_consumable_inventory -- ---------------------------- -INSERT INTO `reagent_consumable_inventory` VALUES ('02D3D8BAAC41BDCDA7C0BFC5FE7C74BE', '0199C4BCB3826CA513564CE9B75D412D', '2-氯地西泮', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1mg/mL于乙腈', '2023-05-30 09:59:10.558000', '2023-06-14 11:49:00.003000', '6dbeaa31c66301796536230d36587145', NULL, '34.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'afdh', 3180.00, NULL, 1, '库存不足', 1, NULL, '35', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('2B267E845029B569594B63EADAEDF4AC', '3B0060DD8BA7C61FB237BF83017D294E', '乙醇', 'C', '试剂', NULL, NULL, '350ml', '2023-05-29 17:28:31.470000', '2023-06-14 11:49:00.007000', '6dbeaa31c66301796536230d36587145', NULL, '100', NULL, 1, '酒精', '1', NULL, NULL, '酒精', '常规贮存', '无', '瓶', 'wind', 10.00, NULL, 1, '库存不足', 1, '6921168511281', '000001', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('315AC3F21A3F5CFC0D87C838B023B3EB', 'EBD80D1F7717ED4C65AB98D3534CD62A', '扎来普隆', 'LGC', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:47.438000', '2023-06-14 11:49:00.012000', '6dbeaa31c66301796536230d36587145', NULL, '33.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ha', 5172.00, NULL, 1, '库存不足', 1, NULL, '34', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('5B705DBBBBE55120C1C36AD2D48AB964', 'B062391CC941FB47A2F2468FEB9A6081', '去甲奥氮平', 'panphy', '标准物质', NULL, NULL, '20mg', '2023-05-29 17:44:14.409000', '2023-06-14 11:49:00.017000', '6dbeaa31c66301796536230d36587145', NULL, '25.99', NULL, 4, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'zzz', 1244.00, NULL, 1, '库存充足', 1, NULL, '26', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('7178E8C4C4C99DEEAA32A9445F4F1E69', '7E978E1590980C6BB78B6395D1E8EEE8', 'α-羟基咪哒唑仑 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,100μg/mL于甲醇', '2023-05-29 17:44:14.748000', '2023-06-14 11:49:00.022000', '6dbeaa31c66301796536230d36587145', NULL, '39.99', NULL, 3, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'fdb', 2000.00, NULL, 1, '库存充足', 1, NULL, '40', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('7600D3C337A374C00F3FFCA64B7F955A', '6542BBD6B77066F8D6844DE9F5BA9037', '黄果树香烟', '黄果树', '耗材', NULL, NULL, '1包', '2023-05-31 16:47:34.806000', '2023-06-14 11:49:00.028000', '1edaef1e50c39f7ac7530cd98561f943', NULL, '无', '无', 2, '烟', '1', NULL, NULL, '磨砂', '常规贮存', '香烟', '盒', NULL, 14.00, NULL, 1, '库存不足', 10, '6901028039741', NULL, NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('86BEB0FE6E1DD2E78DD3A5D99307D37E', 'E41C450FF033E1199EF5EF44919F8154', '农夫山泉矿泉水', '农夫山泉', '耗材', NULL, NULL, '380ml', '2023-05-29 17:28:31.613000', '2023-06-14 11:49:00.034000', '6dbeaa31c66301796536230d36587145', NULL, NULL, NULL, 110, '水', '1', NULL, NULL, '矿泉水', '常规贮存', NULL, '瓶', 'water', 2.00, NULL, 1, '库存充足', 10, '6921168511280', NULL, NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('8C0C5EA5ADD14985136356643B6D4B6B', '62B039CEBA75E2D8680D8B1A8B2B37F0', '咖啡因', 'ChromaDex', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:47.255000', '2023-06-14 11:49:00.039000', '6dbeaa31c66301796536230d36587145', NULL, '2.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ccc', 1500.00, NULL, 1, '库存不足', 1, NULL, '3', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('A03DB4DD4DC2070E93016B98D16AB920', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', '地佐辛', 'panphy', '标准物质', NULL, '96802CF183DCB9D030ED8EC567E99966', '100ug/ml，1ml', '2023-05-29 17:44:14.650000', '2023-06-14 11:49:00.044000', '6dbeaa31c66301796536230d36587145', NULL, '11.99', NULL, 4, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'lll', 2000.00, NULL, 1, '库存充足', 1, NULL, '12', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('A6D2BEDC0E29626E5A7BC396285F983E', '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', ' 普拉西泮', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0mg/mL于甲醇', '2023-05-30 09:50:41.083000', '2023-06-14 11:49:00.050000', '6dbeaa31c66301796536230d36587145', NULL, '23.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'xxx', 1200.00, NULL, 1, '库存不足', 1, NULL, '24', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('CDB3D9303208E07F54C29202A15E8ED0', '5C644C575A3CB38B898BC7FC53FBC9B7', '地佐辛标准储备溶液', 'panphy', '标准储备溶液', NULL, NULL, '100ug/ml，1ml', '2023-05-29 18:07:52.550000', '2023-06-14 11:49:00.083000', '6dbeaa31c66301796536230d36587145', NULL, '11.99', NULL, 1, '一般标准物质', '1', NULL, '100', '毒品', '常规贮存', '天津一方代理', '瓶', 'lll', 2000.00, 12, 1, '无', NULL, NULL, '12', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('D1D7AAD5AC9BF880D757843A08896965', 'BB49662288F656EC7803F65D1FFA29F3', '苯巴比妥-d5 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,100μg/mL于甲醇', '2023-05-30 09:42:24.663000', '2023-06-14 11:49:00.055000', '6dbeaa31c66301796536230d36587145', NULL, '40.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'r4qy', 1500.00, NULL, 1, '库存不足', 1, NULL, '41', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('D2A2D0124C9B2ACDCCFC6C4698AC9314', '659CDA042302E614069BCAA06ED8E646', '2-羟基乙基氟安定 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0 mg/mL于甲醇', '2023-05-29 17:44:14.560000', '2023-06-14 11:49:00.061000', '6dbeaa31c66301796536230d36587145', NULL, '35.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ager', 3210.00, NULL, 1, '库存充足', 1, NULL, '36', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('D7209BCAFAAA0A349205109AC1ED9C89', '29466290A613CB069621FAAAD17688F7', '喷他咗欣', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0mg/mL于甲醇', '2023-05-29 17:28:31.131000', '2023-06-14 11:49:00.066000', '6dbeaa31c66301796536230d36587145', NULL, '24.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'yyy', 1200.00, NULL, 1, '库存充足', 1, NULL, '25', NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('DAECFEB5C4CAFAD0CE1E6497EC4A09E8', '7E4B948494D4ABD162D0E96D24E3D76C', '抽纸', '雅洁尔', '耗材', NULL, NULL, '300抽', '2023-05-29 17:28:31.370000', '2023-06-14 11:49:00.072000', '6dbeaa31c66301796536230d36587145', NULL, NULL, NULL, 799, '纸巾', '1', NULL, NULL, '纸', '常规贮存', '无', '份', 'paper', 5.00, NULL, 1, '库存充足', 10, '6901236348857', NULL, NULL); -INSERT INTO `reagent_consumable_inventory` VALUES ('E5BA2985B12D1754CC1553946CD09AB2', '7FAE89E61DB755E806DE52B036983137', '丙泊酚', 'panphy', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:46.851000', '2023-06-14 11:49:00.077000', '6dbeaa31c66301796536230d36587145', NULL, '16.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'qqq', 873.00, NULL, 1, '库存充足', 1, NULL, '17', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('02D3D8BAAC41BDCDA7C0BFC5FE7C74BE', '0199C4BCB3826CA513564CE9B75D412D', '2-氯地西泮', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1mg/mL于乙腈', '2023-05-30 09:59:10.558000', '2023-06-15 16:36:00.006000', '6dbeaa31c66301796536230d36587145', NULL, '34.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'afdh', 3180.00, NULL, 1, '库存不足', 1, NULL, '35', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('2B267E845029B569594B63EADAEDF4AC', '3B0060DD8BA7C61FB237BF83017D294E', '乙醇', 'C', '试剂', NULL, NULL, '350ml', '2023-05-29 17:28:31.470000', '2023-06-15 16:36:00.011000', '6dbeaa31c66301796536230d36587145', NULL, '100', NULL, 1, '酒精', '1', NULL, NULL, '酒精', '常规贮存', '无', '瓶', 'wind', 10.00, NULL, 1, '库存不足', 1, '6921168511281', '000001', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('315AC3F21A3F5CFC0D87C838B023B3EB', 'EBD80D1F7717ED4C65AB98D3534CD62A', '扎来普隆', 'LGC', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:47.438000', '2023-06-15 16:36:00.019000', '6dbeaa31c66301796536230d36587145', NULL, '33.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ha', 5172.00, NULL, 1, '库存不足', 1, NULL, '34', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('5B705DBBBBE55120C1C36AD2D48AB964', 'B062391CC941FB47A2F2468FEB9A6081', '去甲奥氮平', 'panphy', '标准物质', NULL, NULL, '20mg', '2023-05-29 17:44:14.409000', '2023-06-15 16:36:00.025000', '6dbeaa31c66301796536230d36587145', NULL, '25.99', NULL, 4, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'zzz', 1244.00, NULL, 1, '库存充足', 1, NULL, '26', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('7178E8C4C4C99DEEAA32A9445F4F1E69', '7E978E1590980C6BB78B6395D1E8EEE8', 'α-羟基咪哒唑仑 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,100μg/mL于甲醇', '2023-05-29 17:44:14.748000', '2023-06-15 16:36:00.031000', '6dbeaa31c66301796536230d36587145', NULL, '39.99', NULL, 3, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'fdb', 2000.00, NULL, 1, '库存充足', 1, NULL, '40', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('7600D3C337A374C00F3FFCA64B7F955A', '6542BBD6B77066F8D6844DE9F5BA9037', '黄果树香烟', '黄果树', '耗材', NULL, NULL, '1包', '2023-05-31 16:47:34.806000', '2023-06-15 16:36:00.037000', '1edaef1e50c39f7ac7530cd98561f943', NULL, '无', '无', 2, '烟', '1', NULL, NULL, '磨砂', '常规贮存', '香烟', '盒', NULL, 14.00, NULL, 1, '库存不足', 10, '6901028039741', NULL, NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('86BEB0FE6E1DD2E78DD3A5D99307D37E', 'E41C450FF033E1199EF5EF44919F8154', '农夫山泉矿泉水', '农夫山泉', '耗材', NULL, NULL, '380ml', '2023-05-29 17:28:31.613000', '2023-06-15 16:36:00.044000', '6dbeaa31c66301796536230d36587145', NULL, NULL, NULL, 110, '水', '1', NULL, NULL, '矿泉水', '常规贮存', NULL, '瓶', 'water', 2.00, NULL, 1, '库存充足', 10, '6921168511280', NULL, NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('8C0C5EA5ADD14985136356643B6D4B6B', '62B039CEBA75E2D8680D8B1A8B2B37F0', '咖啡因', 'ChromaDex', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:47.255000', '2023-06-15 16:36:00.050000', '6dbeaa31c66301796536230d36587145', NULL, '2.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ccc', 1500.00, NULL, 1, '库存不足', 1, NULL, '3', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('A03DB4DD4DC2070E93016B98D16AB920', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', '地佐辛', 'panphy', '标准物质', NULL, '96802CF183DCB9D030ED8EC567E99966', '100ug/ml，1ml', '2023-05-29 17:44:14.650000', '2023-06-15 16:36:00.056000', '6dbeaa31c66301796536230d36587145', NULL, '11.99', NULL, 4, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'lll', 2000.00, NULL, 1, '库存充足', 1, NULL, '12', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('A6D2BEDC0E29626E5A7BC396285F983E', '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', ' 普拉西泮', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0mg/mL于甲醇', '2023-05-30 09:50:41.083000', '2023-06-15 16:36:00.062000', '6dbeaa31c66301796536230d36587145', NULL, '23.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'xxx', 1200.00, NULL, 1, '库存不足', 1, NULL, '24', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('CDB3D9303208E07F54C29202A15E8ED0', '5C644C575A3CB38B898BC7FC53FBC9B7', '地佐辛标准储备溶液', 'panphy', '标准储备溶液', NULL, NULL, '100ug/ml，1ml', '2023-05-29 18:07:52.550000', '2023-06-15 16:36:00.100000', '6dbeaa31c66301796536230d36587145', NULL, '11.99', NULL, 1, '一般标准物质', '1', NULL, '100', '毒品', '常规贮存', '天津一方代理', '瓶', 'lll', 2000.00, 12, 1, '无', NULL, NULL, '12', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('D1D7AAD5AC9BF880D757843A08896965', 'BB49662288F656EC7803F65D1FFA29F3', '苯巴比妥-d5 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,100μg/mL于甲醇', '2023-05-30 09:42:24.663000', '2023-06-15 16:36:00.068000', '6dbeaa31c66301796536230d36587145', NULL, '40.99', NULL, 1, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'r4qy', 1500.00, NULL, 1, '库存不足', 1, NULL, '41', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('D2A2D0124C9B2ACDCCFC6C4698AC9314', '659CDA042302E614069BCAA06ED8E646', '2-羟基乙基氟安定 ', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0 mg/mL于甲醇', '2023-05-29 17:44:14.560000', '2023-06-15 16:36:00.074000', '6dbeaa31c66301796536230d36587145', NULL, '35.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'ager', 3210.00, NULL, 1, '库存充足', 1, NULL, '36', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('D7209BCAFAAA0A349205109AC1ED9C89', '29466290A613CB069621FAAAD17688F7', '喷他咗欣', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1.0mg/mL于甲醇', '2023-05-29 17:28:31.131000', '2023-06-15 16:36:00.080000', '6dbeaa31c66301796536230d36587145', NULL, '24.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'yyy', 1200.00, NULL, 1, '库存充足', 1, NULL, '25', NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('DAECFEB5C4CAFAD0CE1E6497EC4A09E8', '7E4B948494D4ABD162D0E96D24E3D76C', '抽纸', '雅洁尔', '耗材', NULL, NULL, '300抽', '2023-05-29 17:28:31.370000', '2023-06-15 16:36:00.086000', '6dbeaa31c66301796536230d36587145', NULL, NULL, NULL, 799, '纸巾', '1', NULL, NULL, '纸', '常规贮存', '无', '份', 'paper', 5.00, NULL, 1, '库存充足', 10, '6901236348857', NULL, NULL); +INSERT INTO `reagent_consumable_inventory` VALUES ('E5BA2985B12D1754CC1553946CD09AB2', '7FAE89E61DB755E806DE52B036983137', '丙泊酚', 'panphy', '标准物质', NULL, NULL, '100mg', '2023-05-30 09:34:46.851000', '2023-06-15 16:36:00.092000', '6dbeaa31c66301796536230d36587145', NULL, '16.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'qqq', 873.00, NULL, 1, '库存充足', 1, NULL, '17', NULL); -- ---------------------------- -- Table structure for reagent_consumables @@ -1630,11 +1631,11 @@ CREATE TABLE `standard_reserve_solution` ( `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, `configuration_concentration` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '(配置浓度(mg/mL))', `configuration_date` datetime(6) NULL DEFAULT NULL COMMENT '(配置日期)', - `constant_volume` double(255, 0) NULL DEFAULT NULL COMMENT '(定容体积（mL）)', + `constant_volume` double(255, 5) NULL DEFAULT NULL COMMENT '(定容体积（mL）)', `dispenser_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '(配制人ID)', `reference_material_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '(标准物质ID)', `reference_material_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '(标准物质编号)', - `reference_material_scale` double(255, 0) NULL DEFAULT NULL COMMENT '(标准物质称取量)', + `reference_material_scale` double(255, 5) NULL DEFAULT NULL COMMENT '(标准物质称取量)', `create_time` datetime(6) NULL DEFAULT NULL COMMENT '--创建时间', `update_time` datetime(6) NULL DEFAULT NULL COMMENT '--修改时间', `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '--创建人', diff --git a/pom.xml b/pom.xml index 09b05d9..0e48b50 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,14 @@ spring-test + + org.springframework + spring-jms + + + org.apache.activemq + activemq-client + digital.laboratory.platform diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java b/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java index 53e6579..47b2664 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import digital.laboratory.platform.common.core.util.R; +import digital.laboratory.platform.common.core.util.SpringContextHolder; import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; +import digital.laboratory.platform.reagent.dto.ApplicationForUseBatchDTO; import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO; import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO; import digital.laboratory.platform.reagent.entity.ApplicationForUse; @@ -14,6 +16,7 @@ import digital.laboratory.platform.reagent.entity.ReagentConsumablesSet; import digital.laboratory.platform.reagent.service.ApplicationForUseService; import digital.laboratory.platform.reagent.service.ReagentConsumablesSetService; import digital.laboratory.platform.reagent.vo.ApplicationForUseVO; +import digital.laboratory.platform.reagent.vo.ReagentConsumablesSetVO; import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; @@ -60,7 +63,7 @@ public class ApplicationForUseController { @ApiOperation(value = "通过id查询", notes = "通过id查询") @GetMapping() @PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')") - public R getById( String applicationForUseId, HttpServletRequest theHttpServletRequest) { + public R getById(String applicationForUseId, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); @@ -92,6 +95,7 @@ public class ApplicationForUseController { return R.ok(applicationForUseVOList); } + /** * 新增(试剂耗材领用申请表) * @@ -133,13 +137,14 @@ public class ApplicationForUseController { ReagentConsumablesSet byId = reagentConsumablesSetService.getById(applicationForUseDTO.getReagentConsumableSetId()); - BeanUtils.copyProperties(applicationForUseDTO,byId); + BeanUtils.copyProperties(applicationForUseDTO, byId); - if ( reagentConsumablesSetService.updateById(byId)){ + if (reagentConsumablesSetService.updateById(byId)) { return R.ok("修改成功"); - }else { + } else { return R.failed("修改失败"); - }} + } + } /** @@ -152,7 +157,7 @@ public class ApplicationForUseController { @SysLog("通过id删除(试剂耗材领用申请表)") @DeleteMapping() @PreAuthorize("@pms.hasPermission('reagent_application_for_use_del')") - public R deleteById( String applicationForUseId, HttpServletRequest theHttpServletRequest) { + public R deleteById(String applicationForUseId, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); @@ -183,6 +188,7 @@ public class ApplicationForUseController { return R.ok("删除成功"); } else return R.failed("删除失败"); } + /** * 提交试剂耗材领用申请表 * @@ -205,4 +211,50 @@ public class ApplicationForUseController { return R.ok(applicationForUse, "提交成功"); } else return R.failed("提交失败"); } + + /** + * 批量提交试剂耗材领用申请表 + * + * @param applicationForUseBatchDTO (批量提交试剂耗材领用申请表) + * @return R + */ + @ApiOperation(value = "批量提交试剂耗材领用申请表", notes = "批量提交试剂耗材领用申请表") + @SysLog("批量提交试剂耗材领用申请表") + @PostMapping("/batch/commit") + @PreAuthorize("@pms.hasPermission('reagent_application_for_use_commit')") + public R batchCommit(ApplicationForUseBatchDTO applicationForUseBatchDTO, HttpServletRequest theHttpServletRequest) { + + Principal principal = theHttpServletRequest.getUserPrincipal(); + + DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); + + ApplicationForUseVO applicationForUse = applicationForUseService.batchCommit(applicationForUseBatchDTO, dlpUser); + + if (applicationForUse != null) { + return R.ok(applicationForUse, "提交成功"); + } else return R.failed("提交失败"); + } + + /** + * 批量提交试剂耗材领用申请表 + * + * @param id (批量提交试剂耗材领用申请表) + * @return R + */ + @ApiOperation(value = "通过实验模板ID查询领用情况", notes = "通过实验模板ID查询领用情况") + @SysLog("通过实验模板ID查询领用情况") + @GetMapping("/get/template") + @PreAuthorize("@pms.hasPermission('reagent_application_for_use_get')") + public R> getReagentConsumablesSets(String id, HttpServletRequest theHttpServletRequest) { + + Principal principal = theHttpServletRequest.getUserPrincipal(); + + DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); + + List reagentConsumablesSets = applicationForUseService.getReagentConsumablesSets(id); + + if (reagentConsumablesSets != null) { + return R.ok(reagentConsumablesSets); + } else return R.failed("未能查询到相关信息"); + } } diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java b/src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java index 97e6490..7b6c10e 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java @@ -143,7 +143,7 @@ public class InstructionBookController { @ApiOperation(value = "预览(标准物质期间核查指导书)", notes = "预览(标准物质期间核查指导书)(标准物质期间核查指导书)") @SysLog("预览(标准物质期间核查指导书)(标准物质期间核查指导书)") @GetMapping("/download") - @PreAuthorize("@pms.hasPermission('reagent_instruction_book_download')" ) +// @PreAuthorize("@pms.hasPermission('reagent_instruction_book_download')" ) public R download(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) throws Exception { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); @@ -180,7 +180,7 @@ public class InstructionBookController { @ApiOperation(value = "查看(标准物质期间核查指导书)", notes = "查看(标准物质期间核查指导书)(标准物质期间核查指导书)") @SysLog("查看(标准物质期间核查指导书)(标准物质期间核查指导书)") @GetMapping() - @PreAuthorize("@pms.hasPermission('reagent_instruction_book_get')" ) +// @PreAuthorize("@pms.hasPermission('reagent_instruction_book_get')" ) public R getVOById(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) throws Exception { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java index 88f3c68..05d20c9 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java @@ -311,7 +311,7 @@ public class ReagentConsumableInventoryController { */ @ApiOperation(value = "", notes = "通过id，获取标准物质所有信息") @GetMapping("/getByCode") - @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get')") + @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get_by_code')") public R getByCode(String id, String number, HttpServletResponse httpServletResponse) { if (StrUtil.isNotBlank(number)) { @@ -332,4 +332,18 @@ public class ReagentConsumableInventoryController { return R.ok(byCode); } + + + /** + * 获取用户列表 + */ + @ApiOperation(value = "", notes = "获取用户列表") + @GetMapping("/userList") + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_add')") + public R> getUserList(HttpServletResponse httpServletResponse) { + + return R.ok(reagentConsumableInventoryService.getUserList()); + } + + } diff --git a/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java new file mode 100644 index 0000000..ff711d5 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java @@ -0,0 +1,12 @@ +package digital.laboratory.platform.reagent.dto; + +import lombok.Data; + +import java.util.List; +@Data +public class ApplicationForUseBatchDTO { + + List applicationForUseDTOList; + + String templateId; +} diff --git a/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java index c94a39b..445c723 100644 --- a/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java +++ b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java @@ -40,4 +40,7 @@ public class ApplicationForUseDTO { @ApiModelProperty(value = "(领用物品明细ID)") private String reagentConsumableSetId; + + + } diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java b/src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java index 748d39b..ce3fd90 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java @@ -71,9 +71,11 @@ public class ApplicationForUse extends BaseEntity { @ApiModelProperty(value="领取码") private String claimCode; - - - + /** + * 实验模板ID + */ + @ApiModelProperty(value="实验模板ID") + private String templateId; } diff --git a/src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java b/src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java index c15706d..d7eadf2 100644 --- a/src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java +++ b/src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java @@ -18,4 +18,5 @@ import java.util.List; @Mapper public interface DetailsOfCentralizedMapper extends BaseMapper { List getDetailsOfCentralizedVOList(String centralizedRequestId); + List getDetailsOfCentralizedVOPlanList(String procurementContentId); } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java b/src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java index 3634f87..530e972 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; +import digital.laboratory.platform.reagent.dto.ApplicationForUseBatchDTO; import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO; import digital.laboratory.platform.reagent.entity.ApplicationForUse; import digital.laboratory.platform.reagent.vo.ApplicationForUseVO; +import digital.laboratory.platform.reagent.vo.ReagentConsumablesSetVO; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -30,4 +33,10 @@ public interface ApplicationForUseService extends IService { ApplicationForUseVO commitApplication(String id, DLPUser dlpUser); Boolean delApplication(String applicationForUseId); + + //提交领用申请记录 + @Transactional + ApplicationForUseVO batchCommit(ApplicationForUseBatchDTO applicationForUseBatchDTO, DLPUser dlpUser); + + List getReagentConsumablesSets(String id); } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java b/src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java index 493cb29..a1f0624 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java @@ -51,4 +51,6 @@ public interface ReagentConsumableInventoryService extends IService getUserList(); } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java index db81c07..6b386f8 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java @@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; +import digital.laboratory.platform.reagent.dto.ApplicationForUseBatchDTO; import digital.laboratory.platform.reagent.dto.ApplicationForUseDTO; -import digital.laboratory.platform.reagent.dto.ComplianceCheckDTO; import digital.laboratory.platform.reagent.entity.*; import digital.laboratory.platform.reagent.mapper.ApplicationForUseMapper; import digital.laboratory.platform.reagent.service.*; @@ -236,4 +237,79 @@ public class ApplicationForUseServiceImpl extends ServiceImpl reagentConsumablesSets = new ArrayList<>(); + + List applicationForUseDTOList = applicationForUseBatchDTO.getApplicationForUseDTOList(); + + for (ApplicationForUseDTO applicationForUseDTO : applicationForUseDTOList) { + + ReagentConsumablesSet reagentConsumablesSet = new ReagentConsumablesSet(); + + BeanUtils.copyProperties(applicationForUseDTO, reagentConsumablesSet); + + reagentConsumablesSet.setId(IdWorker.get32UUID().toUpperCase()); + + reagentConsumablesSet.setApplicationForUseId(applicationForUse.getId()); + + if (applicationForUseDTO.getReferenceMaterialId() != null) { + + reagentConsumablesSet.setReferenceMaterialId(applicationForUseDTO.getReferenceMaterialId()); + } + LambdaQueryWrapper reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>(); + + reagentConsumableInventoryLambdaQueryWrapper.eq(ReagentConsumableInventory::getReagentConsumableId, applicationForUseDTO.getReagentConsumableId()); + + ReagentConsumableInventory one = reagentConsumableInventoryService.getOne(reagentConsumableInventoryLambdaQueryWrapper); + + Integer totalQuantity = one.getTotalQuantity(); + + if (reagentConsumablesSet.getQuantity() > totalQuantity) { + + throw new RuntimeException(String.format("领用数量不能大于库存量")); + } + + reagentConsumablesSets.add(reagentConsumablesSet); + } + if (this.save(applicationForUse) & reagentConsumablesSetService.saveBatch(reagentConsumablesSets) + ) { + this.commitApplication(applicationForUse.getId(), dlpUser); + ApplicationForUseVO applicationForUseVO = this.getApplicationForUseVO(applicationForUse.getId()); + return applicationForUseVO; + } else return null; + } + + /* + *通过实验模板ID查询领用的所有物品*/ + @Override + public List getReagentConsumablesSets(String id) { + + List applicationForUseList = this.list(Wrappers.query().eq("template_id", id)); + + List reagentConsumablesSetList = new ArrayList<>(); + + for (ApplicationForUse applicationForUse : applicationForUseList) { + + List list = reagentConsumablesSetService.getList(applicationForUse.getId()); + + reagentConsumablesSetList.addAll(list); + + } + return reagentConsumablesSetList; + } } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java index 5e72d26..c1e45c6 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java @@ -60,7 +60,6 @@ public class ComplianceCheckServiceImpl extends ServiceImpl getComplianceCheckVOPage(IPage page, QueryWrapper qw) { @@ -151,7 +150,7 @@ public class ComplianceCheckServiceImpl extends ServiceImpl0){ throw new RuntimeException(String.format("当前状态无法删除")); } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java index 7487b57..a4889e1 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java @@ -53,43 +53,43 @@ public class DetailsOfCentralizedServiceImpl extends ServiceImpl getDetailsOfCentralizedList(String purchasingPlanId) { - - LambdaQueryWrapper detailsOfCentralizedLambdaQueryWrapper = new LambdaQueryWrapper<>(); - - detailsOfCentralizedLambdaQueryWrapper.eq(DetailsOfCentralized::getProcurementContentId, purchasingPlanId); - - List list = this.list(detailsOfCentralizedLambdaQueryWrapper); - - List detailsOfCentralizedVOS = new ArrayList<>(); - - for (DetailsOfCentralized detailsOfCentralized : list) { - - CentralizedRequestVO centralizedRequestVO = centralizedRequestService.getCentralizedRequestVO(detailsOfCentralized.getCentralizedRequestId()); - - LambdaQueryWrapper reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>(); - - reagentConsumablesLambdaQueryWrapper.eq(ReagentConsumables::getReagentConsumableId, detailsOfCentralized.getReagentConsumableId()); - - ReagentConsumables one = reagentConsumablesService.getOne(reagentConsumablesLambdaQueryWrapper); - - DetailsOfCentralizedVO detailsOfCentralizedVO = new DetailsOfCentralizedVO(); - - BeanUtils.copyProperties(detailsOfCentralized, detailsOfCentralizedVO); - - detailsOfCentralizedVO.setReplacementReagentConsumableName(one.getReagentConsumableName()); - - detailsOfCentralizedVO.setDepartment(centralizedRequestVO.getDepartment()); - - detailsOfCentralizedVO.setApplicantName(centralizedRequestVO.getApplicantName()); - - detailsOfCentralizedVOS.add(detailsOfCentralizedVO); - detailsOfCentralizedVO.setSpecies(one.getSpecies()); - detailsOfCentralizedVO.setDeviationOrUncertainty(one.getDeviationOrUncertainty()); - detailsOfCentralizedVO.setMinimumUnit(one.getMinimumUnit()); - detailsOfCentralizedVO.setPackagedCopies(one.getPackagedCopies().toString()); - detailsOfCentralizedVO.setStandardValueOrPurity(one.getStandardValueOrPurity()); - } - return detailsOfCentralizedVOS; + public List getDetailsOfCentralizedList(String procurementContentId) { + +// LambdaQueryWrapper detailsOfCentralizedLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// +// detailsOfCentralizedLambdaQueryWrapper.eq(DetailsOfCentralized::getProcurementContentId, purchasingPlanId); +// +// List list = this.list(detailsOfCentralizedLambdaQueryWrapper); +// +// List detailsOfCentralizedVOS = new ArrayList<>(); +// +// for (DetailsOfCentralized detailsOfCentralized : list) { +// +// CentralizedRequestVO centralizedRequestVO = centralizedRequestService.getCentralizedRequestVO(detailsOfCentralized.getCentralizedRequestId()); +// +// LambdaQueryWrapper reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>(); +// +// reagentConsumablesLambdaQueryWrapper.eq(ReagentConsumables::getReagentConsumableId, detailsOfCentralized.getReagentConsumableId()); +// +// ReagentConsumables one = reagentConsumablesService.getOne(reagentConsumablesLambdaQueryWrapper); +// +// DetailsOfCentralizedVO detailsOfCentralizedVO = new DetailsOfCentralizedVO(); +// +// BeanUtils.copyProperties(detailsOfCentralized, detailsOfCentralizedVO); +// +// detailsOfCentralizedVO.setReplacementReagentConsumableName(one.getReagentConsumableName()); +// +// detailsOfCentralizedVO.setDepartment(centralizedRequestVO.getDepartment()); +// +// detailsOfCentralizedVO.setApplicantName(centralizedRequestVO.getApplicantName()); +// +// detailsOfCentralizedVOS.add(detailsOfCentralizedVO); +// detailsOfCentralizedVO.setSpecies(one.getSpecies()); +// detailsOfCentralizedVO.setDeviationOrUncertainty(one.getDeviationOrUncertainty()); +// detailsOfCentralizedVO.setMinimumUnit(one.getMinimumUnit()); +// detailsOfCentralizedVO.setPackagedCopies(one.getPackagedCopies().toString()); +// detailsOfCentralizedVO.setStandardValueOrPurity(one.getStandardValueOrPurity()); +// } + return baseMapper.getDetailsOfCentralizedVOPlanList(procurementContentId); } } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java index 3e41af7..dc36f0d 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java @@ -259,6 +259,8 @@ public class PurchaseCatalogueServiceImpl extends ServiceImpl centralizedRequestList = centralizedRequestService.list(Wrappers.query().eq("purchasing_plan_id", plan.getPurchasingPlanId())); + List centralizedRequestList = centralizedRequestService.list(Wrappers.query().eq("purchasing_plan_id", plan.getPurchasingPlanId())); for (CentralizedRequest centralizedRequest : centralizedRequestList) { centralizedRequest.setStatus(4); centralizedRequestService.updateById(centralizedRequest); @@ -200,8 +200,8 @@ public class PurchaseListServiceImpl extends ServiceImpl catalogueDetailsLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java index 64e0627..0904f05 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java @@ -305,7 +305,7 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl 0) { + if (reagentConsumableInventory.getTotalQuantity() >= 0) { LambdaQueryWrapper referenceMaterialLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -643,4 +643,10 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl getUserList(){ + + return baseMapper.getUserList(); + } } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java index 02e2b52..4a4baaf 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java @@ -121,11 +121,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java b/src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java index d216a16..8a93772 100644 --- a/src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java +++ b/src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java @@ -33,7 +33,7 @@ public class MaturityCalculation { private final ReferenceMaterialService referenceMaterialService; - @Scheduled(cron = "0 0 0 * * ? ") + @Scheduled(cron = "1 0 0 * * ? ") public void calculate() { //查找出有库存量的物品所有批次信息(状态为1) List list1 = batchDetailsService.list(Wrappers.query().eq("service_status", 1)); diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 93f3a2b..a800923 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -63,4 +63,13 @@ oss: secretKey: 87990016 bucket-name: dlpfiles +config: + activemq: + brokerUrl: tcp://localhost:61616 + user: admin + password: admin + #true：topic模式，false：queue模式 + pub-sub-domain: true + msgListener: + reagentTopicName: reagent diff --git a/src/main/resources/mapper/ApplicationForUseMapper.xml b/src/main/resources/mapper/ApplicationForUseMapper.xml index d5e1692..f165f51 100644 --- a/src/main/resources/mapper/ApplicationForUseMapper.xml +++ b/src/main/resources/mapper/ApplicationForUseMapper.xml @@ -16,6 +16,7 @@ + + + + + + + + + + + + + + + + @@ -41,5 +56,47 @@ order by create_time desc - + +