Dlp-Gyjd
/
dlp-reagent-managment
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新数据库

Browse Source
main
杨海航 2 years ago
parent c6d685399e
commit 002e48e312
22 changed files with 364 additions and 114 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 101
      db/dlp_reagent_managment.sql
  2. 8
      pom.xml
  3. 64
      src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java
  4. 4
      src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java
  5. 16
      src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java
  6. 12
      src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java
  7. 3
      src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java
  8. 8
      src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java
  9. 1
      src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java
  10. 9
      src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java
  11. 2
      src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java
  12. 78
      src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java
  13. 3
      src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java
  14. 76
      src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java
  15. 2
      src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java
  16. 2
      src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseListServiceImpl.java
  17. 8
      src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java
  18. 6
      src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java
  19. 2
      src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java
  20. 9
      src/main/resources/bootstrap.yml
  21. 1
      src/main/resources/mapper/ApplicationForUseMapper.xml
  22. 59
      src/main/resources/mapper/DetailsOfCentralizedMapper.xml

101
db/dlp_reagent_managment.sql
Unescape View File

@ -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 '--创建人',

8
pom.xml
Unescape View File

@ -163,6 +163,14 @@
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
</dependency>
<dependency>
<groupId>digital.laboratory.platform</groupId>

64
src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java
Unescape View File

@ -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<ApplicationForUseVO> getById( String applicationForUseId, HttpServletRequest theHttpServletRequest) {
public R<ApplicationForUseVO> 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<String> deleteById( String applicationForUseId, HttpServletRequest theHttpServletRequest) {
public R<String> 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<ApplicationForUseVO> 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<List<ReagentConsumablesSetVO>> getReagentConsumablesSets(String id, HttpServletRequest theHttpServletRequest) {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();
List<ReagentConsumablesSetVO> reagentConsumablesSets = applicationForUseService.getReagentConsumablesSets(id);
if (reagentConsumablesSets != null) {
return R.ok(reagentConsumablesSets);
} else return R.failed("未能查询到相关信息");
}
}

4
src/main/java/digital/laboratory/platform/reagent/controller/InstructionBookController.java
Unescape View File

@ -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<InstructionBook> 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<InstructionBookVO> getVOById(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) throws Exception {
Principal principal = theHttpServletRequest.getUserPrincipal();
DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal();

16
src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java
Unescape View File

@ -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<ReagentConsumableInventoryFullVO> 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<List<UserVO>> getUserList(HttpServletResponse httpServletResponse) {
return R.ok(reagentConsumableInventoryService.getUserList());
}
}

12
src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java
Unescape View File

@ -0,0 +1,12 @@
package digital.laboratory.platform.reagent.dto;
import lombok.Data;
import java.util.List;
@Data
public class ApplicationForUseBatchDTO {
List<ApplicationForUseDTO> applicationForUseDTOList;
String templateId;
}

3
src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseDTO.java
Unescape View File

@ -40,4 +40,7 @@ public class ApplicationForUseDTO {
@ApiModelProperty(value = "(领用物品明细ID)")
private String reagentConsumableSetId;
}

8
src/main/java/digital/laboratory/platform/reagent/entity/ApplicationForUse.java
Unescape View File

@ -71,9 +71,11 @@ public class ApplicationForUse extends BaseEntity {
@ApiModelProperty(value="领取码")
private String claimCode;
/**
* 实验模板ID
*/
@ApiModelProperty(value="实验模板ID")
private String templateId;
}

1
src/main/java/digital/laboratory/platform/reagent/mapper/DetailsOfCentralizedMapper.java
Unescape View File

@ -18,4 +18,5 @@ import java.util.List;
@Mapper
public interface DetailsOfCentralizedMapper extends BaseMapper<DetailsOfCentralized> {
List<DetailsOfCentralizedVO> getDetailsOfCentralizedVOList(String centralizedRequestId);
List<DetailsOfCentralizedVO> getDetailsOfCentralizedVOPlanList(String procurementContentId);
}

9
src/main/java/digital/laboratory/platform/reagent/service/ApplicationForUseService.java
Unescape View File

@ -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<ApplicationForUse> {
ApplicationForUseVO commitApplication(String id, DLPUser dlpUser);
Boolean delApplication(String applicationForUseId);
//提交领用申请记录
@Transactional
ApplicationForUseVO batchCommit(ApplicationForUseBatchDTO applicationForUseBatchDTO, DLPUser dlpUser);
List<ReagentConsumablesSetVO> getReagentConsumablesSets(String id);
}

2
src/main/java/digital/laboratory/platform/reagent/service/ReagentConsumableInventoryService.java
Unescape View File

@ -51,4 +51,6 @@ public interface ReagentConsumableInventoryService extends IService<ReagentConsu
String buildCodeLabelContent(String code);
String printSolutionTag(String id);
List<UserVO> getUserList();
}

78
src/main/java/digital/laboratory/platform/reagent/service/impl/ApplicationForUseServiceImpl.java
Unescape View File

@ -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<ApplicationForUseM
}
return substring;
}
//提交领用申请记录
@Transactional
@Override
public ApplicationForUseVO batchCommit(ApplicationForUseBatchDTO applicationForUseBatchDTO, DLPUser dlpUser) {
ApplicationForUse applicationForUse = new ApplicationForUse();
applicationForUse.setId(IdWorker.get32UUID().toUpperCase());
applicationForUse.setStatus(0);
applicationForUse.setRecipientId(dlpUser.getId());
applicationForUse.setTemplateId(applicationForUseBatchDTO.getTemplateId());
List<ReagentConsumablesSet> reagentConsumablesSets = new ArrayList<>();
List<ApplicationForUseDTO> 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<ReagentConsumableInventory> 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<ReagentConsumablesSetVO> getReagentConsumablesSets(String id) {
List<ApplicationForUse> applicationForUseList = this.list(Wrappers.<ApplicationForUse>query().eq("template_id", id));
List<ReagentConsumablesSetVO> reagentConsumablesSetList = new ArrayList<>();
for (ApplicationForUse applicationForUse : applicationForUseList) {
List<ReagentConsumablesSetVO> list = reagentConsumablesSetService.getList(applicationForUse.getId());
reagentConsumablesSetList.addAll(list);
}
return reagentConsumablesSetList;
}
}

3
src/main/java/digital/laboratory/platform/reagent/service/impl/ComplianceCheckServiceImpl.java
Unescape View File

@ -60,7 +60,6 @@ public class ComplianceCheckServiceImpl extends ServiceImpl<ComplianceCheckMappe
@Autowired
private ReagentConsumablesService reagentConsumablesService;
@Override
public IPage<ComplianceCheckVO> getComplianceCheckVOPage(IPage<ComplianceCheck> page, QueryWrapper<ComplianceCheck> qw) {
@ -151,7 +150,7 @@ public class ComplianceCheckServiceImpl extends ServiceImpl<ComplianceCheckMappe
ComplianceCheck byId = this.getById(complianceCheckId);
if (byId.getStatus()!=0){
if (byId.getStatus()>0){
throw new RuntimeException(String.format("当前状态无法删除"));
}

76
src/main/java/digital/laboratory/platform/reagent/service/impl/DetailsOfCentralizedServiceImpl.java
Unescape View File

@ -53,43 +53,43 @@ public class DetailsOfCentralizedServiceImpl extends ServiceImpl<DetailsOfCentra
}
@Override
public List<DetailsOfCentralizedVO> getDetailsOfCentralizedList(String purchasingPlanId) {
LambdaQueryWrapper<DetailsOfCentralized> detailsOfCentralizedLambdaQueryWrapper = new LambdaQueryWrapper<>();
detailsOfCentralizedLambdaQueryWrapper.eq(DetailsOfCentralized::getProcurementContentId, purchasingPlanId);
List<DetailsOfCentralized> list = this.list(detailsOfCentralizedLambdaQueryWrapper);
List<DetailsOfCentralizedVO> detailsOfCentralizedVOS = new ArrayList<>();
for (DetailsOfCentralized detailsOfCentralized : list) {
CentralizedRequestVO centralizedRequestVO = centralizedRequestService.getCentralizedRequestVO(detailsOfCentralized.getCentralizedRequestId());
LambdaQueryWrapper<ReagentConsumables> 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<DetailsOfCentralizedVO> getDetailsOfCentralizedList(String procurementContentId) {
// LambdaQueryWrapper<DetailsOfCentralized> detailsOfCentralizedLambdaQueryWrapper = new LambdaQueryWrapper<>();
//
// detailsOfCentralizedLambdaQueryWrapper.eq(DetailsOfCentralized::getProcurementContentId, purchasingPlanId);
//
// List<DetailsOfCentralized> list = this.list(detailsOfCentralizedLambdaQueryWrapper);
//
// List<DetailsOfCentralizedVO> detailsOfCentralizedVOS = new ArrayList<>();
//
// for (DetailsOfCentralized detailsOfCentralized : list) {
//
// CentralizedRequestVO centralizedRequestVO = centralizedRequestService.getCentralizedRequestVO(detailsOfCentralized.getCentralizedRequestId());
//
// LambdaQueryWrapper<ReagentConsumables> 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);
}
}

2
src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseCatalogueServiceImpl.java
Unescape View File

@ -259,6 +259,8 @@ public class PurchaseCatalogueServiceImpl extends ServiceImpl<PurchaseCatalogueM
.eq(StrUtil.isNotBlank(catalogueDetails.getEnglishName()), "english_name", catalogueDetails.getEnglishName())
.eq(StrUtil.isNotBlank(catalogueDetails.getPackagedCopies()), "packaged_copies", catalogueDetails.getPackagedCopies())
.eq(StrUtil.isNotBlank(catalogueDetails.getAlias()), "alias", catalogueDetails.getAlias())
.eq(StrUtil.isNotBlank(catalogueDetails.getPurityGrade()), "purity_grade", catalogueDetails.getPurityGrade())
.eq(StrUtil.isNotBlank(catalogueDetails.getDeviationOrUncertainty()), "deviation_or_uncertainty", catalogueDetails.getDeviationOrUncertainty())
);
if (one == null) {

2
src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseListServiceImpl.java
Unescape View File

@ -200,7 +200,7 @@ public class PurchaseListServiceImpl extends ServiceImpl<PurchaseListMapper, Pur
warehousingContent.setPurchaseListDetailsId(purchaseListDetails.getId());
if (one!=null){
if (one != null) {
warehousingContent.setWarningValue(one.getWarningValue());
}
LambdaQueryWrapper<CatalogueDetails> catalogueDetailsLambdaQueryWrapper = new LambdaQueryWrapper<>();

8
src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java
Unescape View File

@ -305,7 +305,7 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl<ReagentCo
//通过仓库类信息，查找对应的该类所有标准物质
for (ReagentConsumableInventory reagentConsumableInventory : list) {
if (reagentConsumableInventory.getTotalQuantity() > 0) {
if (reagentConsumableInventory.getTotalQuantity() >= 0) {
LambdaQueryWrapper<ReferenceMaterial> referenceMaterialLambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -643,4 +643,10 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl<ReagentCo
return remoteTemplate2htmlService.getHtml(templateFileName, data);
}
@Override
public List<UserVO> getUserList(){
return baseMapper.getUserList();
}
}

6
src/main/java/digital/laboratory/platform/reagent/service/impl/StandardReserveSolutionServiceImpl.java
Unescape View File

@ -121,11 +121,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl<StandardRese
//计算浓度
Double v = standardReserveSolution.getReferenceMaterialScale() / standardReserveSolution.getConstantVolume();
BigDecimal bigDecimal = new BigDecimal(v);
BigDecimal bigDecimal1 = bigDecimal.setScale(2);
standardReserveSolution.setConfigurationConcentration(bigDecimal1.toString());
standardReserveSolution.setConfigurationConcentration(String.format("%.02f", v));
LambdaQueryWrapper<ReagentConsumableInventory> reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>();

2
src/main/java/digital/laboratory/platform/reagent/task/MaturityCalculation.java
Unescape View File

@ -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<BatchDetails> list1 = batchDetailsService.list(Wrappers.<BatchDetails>query().eq("service_status", 1));

9
src/main/resources/bootstrap.yml
Unescape View File

@ -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

1
src/main/resources/mapper/ApplicationForUseMapper.xml
Unescape View File

@ -16,6 +16,7 @@
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="templateId" column="template_id"/>
</resultMap>
<resultMap id="applicationForUseVO" type="digital.laboratory.platform.reagent.vo.ApplicationForUseVO"

59
src/main/resources/mapper/DetailsOfCentralizedMapper.xml
Unescape View File

@ -17,12 +17,27 @@
<result property="detailsRemark" column="details_remark"/>
<result property="replacementRemark" column="replacement_remark"/>
<result property="purpose" column="purpose"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="updateBy" column="update_by"/>
<result property="procurementContentId" column="procurement_content_id"/>
</resultMap>
<resultMap id="DetailsOfCentralizedVO" type="digital.laboratory.platform.reagent.vo.DetailsOfCentralizedVO"
extends="detailsOfCentralizedMap">
<result property="reagentConsumableName" column="reagent_consumable_name"/>
<result property="replacementReagentConsumableName" column="replacement_reagent_consumable_name"/>
<result property="brand" column="brand"/>
<result property="category" column="category"/>
<result property="specificationAndModel" column="specification_and_model"/>
<result property="standardValueOrPurity" column="standard_value_or_purity"/>
<result property="packagedCopies" column="packaged_copies"/>
<result property="minimumUnit" column="minimum_unit"/>
<result property="deviationOrUncertainty" column="deviation_or_uncertainty"/>
<result property="species" column="species"/>
<result property="department" column="department"/>
<result property="applicantName" column="applicant_name"/>
</resultMap>
@ -41,5 +56,47 @@
order by create_time desc
</select>
<!-- 根据条件取 DetailsOfCentralizedVO 列表 -->
<select id="getDetailsOfCentralizedVOPlanList" resultMap="DetailsOfCentralizedVO"
resultType="digital.laboratory.platform.reagent.vo.DetailsOfCentralizedVO">
select dc.*,
(SELECT rc.reagent_consumable_name
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.reagent_consumable_id) AS reagent_consumable_name,
(SELECT rc.reagent_consumable_name
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS replacement_reagent_consumable_name,
(SELECT rc.brand
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS brand,
(SELECT rc.category
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS category,
(SELECT rc.specification_and_model
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS specification_and_model,
(SELECT rc.standard_value_or_purity
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS standard_value_or_purity,
(SELECT rc.packaged_copies
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS packaged_copies,
(SELECT rc.minimum_unit
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS minimum_unit,
(SELECT rc.deviation_or_uncertainty
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS deviation_or_uncertainty,
(SELECT rc.species
FROM reagent_consumables rc
WHERE rc.reagent_consumable_id = dc.replacement_reagent_consumable_id) AS species,
(select department from dlp_base.sys_user where user_id = dc.create_by) AS department,
(SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=dc.create_by
) AS applicant_name
from details_of_centralized dc
where dc.procurement_content_id = #{procurementContentId}
order by create_time desc
</select>
</mapper>

Write Preview
Loading…
Cancel
Save