From 976aa1422f4a2f1d28aa664e9d1674d543a87a33 Mon Sep 17 00:00:00 2001 From: yanghh <1344638791@qq.com> Date: Fri, 23 Jun 2023 16:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9BBU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dlp_reagent_managment.sql | 190 +++++++++++------- .../AcceptanceRecordFormController.java | 21 +- .../ApplicationForUseController.java | 2 +- .../controller/ComplianceCheckController.java | 7 +- .../DecentralizedRequestController.java | 30 ++- .../PurchaseCatalogueController.java | 28 +-- .../controller/PurchasingPlanController.java | 51 ++--- .../ReagentConsumableInventoryController.java | 3 - ...tandardMaterialApprovalFormController.java | 24 +-- .../WarehousingRecordFormController.java | 5 +- .../dto/AcceptanceRecordFormAuditDTO.java | 14 ++ .../dto/ApplicationForUseBatchDTO.java | 2 +- .../reagent/entity/AcceptanceRecordForm.java | 2 +- .../reagent/entity/AcceptanceSignFor.java | 32 +++ .../reagent/entity/CentralizedRequest.java | 22 +- .../reagent/entity/ComplianceCheck.java | 2 +- .../reagent/entity/DecentralizeDetails.java | 4 +- .../reagent/entity/ReagentConsumablesSet.java | 3 +- .../reagent/entity/RequisitionRecord.java | 2 +- .../mapper/AcceptanceRecordFormMapper.java | 2 +- .../mapper/AcceptanceSignForMapper.java | 11 + .../service/AcceptanceRecordFormService.java | 2 +- .../service/AcceptanceSignForService.java | 7 + .../service/DecentralizedRequestService.java | 4 + .../impl/AcceptanceRecordFormServiceImpl.java | 67 +++++- .../impl/AcceptanceSignForServiceImpl.java | 11 + .../impl/ApplicationForUseServiceImpl.java | 7 +- .../impl/CategoryTableServiceImpl.java | 3 - .../impl/CentralizedRequestServiceImpl.java | 23 ++- .../impl/CheckScheduleServiceImpl.java | 6 +- .../impl/DecentralizedRequestServiceImpl.java | 174 ++++++++++++++-- .../DeliveryRegistrationFormServiceImpl.java | 6 +- ...VerificationImplementationServiceImpl.java | 15 +- .../impl/PurchaseCatalogueServiceImpl.java | 1 + .../service/impl/PurchaseListServiceImpl.java | 16 +- ...ReagentConsumableInventoryServiceImpl.java | 16 +- .../ReagentConsumablesSetServiceImpl.java | 23 ++- .../impl/RequisitionRecordServiceImpl.java | 8 +- .../impl/ReviewAndApproveServiceImpl.java | 20 -- ...tandardMaterialApplicationServiceImpl.java | 6 +- ...andardMaterialApprovalFormServiceImpl.java | 6 +- .../StandardReserveSolutionServiceImpl.java | 25 ++- .../StandardSolutionCurveServiceImpl.java | 5 +- .../impl/SupplierInformationServiceImpl.java | 21 +- .../WarehousingRecordFormServiceImpl.java | 4 + .../platform/reagent/utils/PageUtils.java | 29 +-- .../vo/AcceptanceRecordFormFullVO.java | 14 ++ .../reagent/vo/ReagentConsumablesSetVO.java | 1 + .../reagent/vo/ReferenceMaterialVO.java | 2 +- .../reagent/vo/StandardReserveSolutionVO.java | 4 + .../mapper/AcceptanceRecordFormMapper.xml | 1 - .../resources/mapper/AcceptanceSignFor.xml | 18 ++ .../mapper/RequisitionRecordMapper.xml | 2 +- .../mapper/SolutionUseFormMapper.xml | 10 +- 54 files changed, 697 insertions(+), 317 deletions(-) create mode 100644 src/main/java/digital/laboratory/platform/reagent/dto/AcceptanceRecordFormAuditDTO.java create mode 100644 src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java create mode 100644 src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceSignForMapper.java create mode 100644 src/main/java/digital/laboratory/platform/reagent/service/AcceptanceSignForService.java create mode 100644 src/main/java/digital/laboratory/platform/reagent/service/impl/AcceptanceSignForServiceImpl.java create mode 100644 src/main/java/digital/laboratory/platform/reagent/vo/AcceptanceRecordFormFullVO.java create mode 100644 src/main/resources/mapper/AcceptanceSignFor.xml diff --git a/db/dlp_reagent_managment.sql b/db/dlp_reagent_managment.sql index 2e38c45..d119e95 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: 16/06/2023 13:59:14 + Date: 23/06/2023 16:35:10 */ SET NAMES utf8mb4; @@ -60,36 +60,57 @@ CREATE TABLE `acceptance_record_form` ( `user_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'user_name', `commit_time` datetime(6) NULL DEFAULT NULL COMMENT '提交时间', `reagent_consumable_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验收物品名称', + `acceptance_sign_for_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '(验收记录表)' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of acceptance_record_form -- ---------------------------- -INSERT INTO `acceptance_record_form` VALUES ('04C989B7E833B5439C01871637EAEC54', '合格', NULL, '2023-06-14 11:04:51.543000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'EBD80D1F7717ED4C65AB98D3534CD62A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.534000', '2023-06-14 11:04:51.543000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.543000', '扎来普隆'); -INSERT INTO `acceptance_record_form` VALUES ('067FDAABDED95ED626A757CDB920158A', '合格', NULL, '2023-06-14 11:04:51.520000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0199C4BCB3826CA513564CE9B75D412D', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.845000', '2023-06-14 11:04:51.520000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.520000', '2-氯地西泮'); -INSERT INTO `acceptance_record_form` VALUES ('084DAC178E70064C0CDFCF429CE02F44', '合格', NULL, '2023-06-14 11:04:51.537000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:03.672000', '2023-06-14 11:04:51.537000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.537000', '去甲奥氮平'); -INSERT INTO `acceptance_record_form` VALUES ('16B23550233AEC8EB8184FF5F16F0529', '合格', '2023-05-29 17:39:51.759000', '2023-05-29 17:39:25.034000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:39:31.232', '29466290A613CB069621FAAAD17688F7', NULL, '2023-05-29 17:39:43.322000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:28:31.722000', '2023-05-29 17:39:51.759000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:39:25.034000', '喷他咗欣'); -INSERT INTO `acceptance_record_form` VALUES ('1EF43D46A4FE92FB3C3BDE922574ED5C', '合格', NULL, '2023-06-14 11:04:51.535000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'BB49662288F656EC7803F65D1FFA29F3', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:03.678000', '2023-06-14 11:04:51.536000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.535000', '苯巴比妥-d5 '); -INSERT INTO `acceptance_record_form` VALUES ('333D30D32BFF2585FA83711900B853B7', '合格', NULL, '2023-06-14 11:04:51.528000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.295000', '2023-06-14 11:04:51.528000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.528000', ' 普拉西泮'); -INSERT INTO `acceptance_record_form` VALUES ('541879933DCB94ABAFD2FB84544865AB', '合格', NULL, '2023-06-14 11:04:51.530000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.294000', '2023-06-14 11:04:51.530000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.530000', '地佐辛'); -INSERT INTO `acceptance_record_form` VALUES ('56F0D3C6EC6093C85CBE8AA9650EAFF6', '合格', '2023-05-29 17:33:22.499000', '2023-05-29 17:32:55.694000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:33:01.852', '7E4B948494D4ABD162D0E96D24E3D76C', NULL, '2023-05-29 17:33:13.023000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:28:31.724000', '2023-05-29 17:33:22.500000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:32:55.694000', '抽纸'); -INSERT INTO `acceptance_record_form` VALUES ('57EFDA9C852F8EB282DAA0FF472D46D7', '合格', NULL, '2023-06-14 11:04:51.513000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E4B948494D4ABD162D0E96D24E3D76C', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.846000', '2023-06-14 11:04:51.518000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.513000', '抽纸'); -INSERT INTO `acceptance_record_form` VALUES ('5C7C9EF6B89A391F7C94F9BBC96E8B71', '合格', NULL, '2023-06-14 11:04:51.545000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '62B039CEBA75E2D8680D8B1A8B2B37F0', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.532000', '2023-06-14 11:04:51.545000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.545000', '咖啡因'); -INSERT INTO `acceptance_record_form` VALUES ('60A8E7F0DE18C0D9206E6F3345D10D43', '合格', NULL, '2023-06-14 11:04:51.524000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'E41C450FF033E1199EF5EF44919F8154', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.842000', '2023-06-14 11:04:51.524000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.524000', '农夫山泉矿泉水'); -INSERT INTO `acceptance_record_form` VALUES ('7544E8FE033671B691F2BCF1593D28BD', '验收合格', '2023-05-30 11:28:45.634000', '2023-05-29 17:44:54.262000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:14.155', '659CDA042302E614069BCAA06ED8E646', NULL, '2023-05-30 11:28:22.760000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:44:14.843000', '2023-05-30 11:28:45.635000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:44:54.262000', '2-羟基乙基氟安定 '); -INSERT INTO `acceptance_record_form` VALUES ('75E5815B74DC0429BFF50E9C9FB55F59', '合格', NULL, '2023-06-14 11:04:51.553000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7FAE89E61DB755E806DE52B036983137', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.530000', '2023-06-14 11:04:51.553000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.553000', '丙泊酚'); -INSERT INTO `acceptance_record_form` VALUES ('77F0A3E4DAF31C3AC611BDE9AC306E01', '合格', NULL, '2023-06-14 11:04:51.550000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E4B948494D4ABD162D0E96D24E3D76C', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.531000', '2023-06-14 11:04:51.550000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.550000', '抽纸'); -INSERT INTO `acceptance_record_form` VALUES ('8251DDF8A33668574197D1E45198D2B9', '合格', NULL, '2023-06-14 11:04:51.541000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:43:14.081000', '2023-06-14 11:04:51.541000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.541000', 'α-羟基咪哒唑仑 '); -INSERT INTO `acceptance_record_form` VALUES ('85999D4C99A0A69637323DB72580AA68', '合格', NULL, '2023-06-14 11:04:51.526000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.840000', '2023-06-14 11:04:51.526000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.526000', '地佐辛'); -INSERT INTO `acceptance_record_form` VALUES ('8E1DED355AD33C9210016F45E92ACFB5', '验收合格', NULL, '2023-05-29 17:45:03.380000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:16.09', '3B0060DD8BA7C61FB237BF83017D294E', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:28:31.725000', '2023-05-29 17:45:16.091000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:03.380000', '乙醇'); -INSERT INTO `acceptance_record_form` VALUES ('9097BCF87BC550ACBB9C18C8CC5C4A42', '合格', NULL, '2023-06-14 11:04:51.539000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '659CDA042302E614069BCAA06ED8E646', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:00.464000', '2023-06-14 11:04:51.539000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.539000', '2-羟基乙基氟安定 '); -INSERT INTO `acceptance_record_form` VALUES ('A57B868D5964C7C0EAA95AD5BE46CAB7', '验收合格', NULL, '2023-05-29 17:45:06.009000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:18.02', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.845000', '2023-05-29 17:45:18.020000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:06.009000', '地佐辛'); -INSERT INTO `acceptance_record_form` VALUES ('B0774949A04AF2C34F1FC8EE463411FC', '验收合格', NULL, '2023-05-29 17:45:08.123000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:20.002', 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.842000', '2023-05-29 17:45:20.002000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:08.123000', '去甲奥氮平'); -INSERT INTO `acceptance_record_form` VALUES ('BB7BCA1334B3B8FE9643AD23A38F1D2D', '合格', NULL, '2023-06-14 11:04:51.531000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.292000', '2023-06-14 11:04:51.532000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.531000', 'α-羟基咪哒唑仑 '); -INSERT INTO `acceptance_record_form` VALUES ('DA5CDD3B3B2228DBE04D1F2DCD680901', '验收合格', NULL, '2023-05-29 17:45:10.147000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:21.876', '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.846000', '2023-05-29 17:45:21.876000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:10.147000', 'α-羟基咪哒唑仑 '); -INSERT INTO `acceptance_record_form` VALUES ('EB3E9C053653002AFBACF831467E9EBC', '合格', NULL, '2023-06-14 11:04:51.522000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '3B0060DD8BA7C61FB237BF83017D294E', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.843000', '2023-06-14 11:04:51.522000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.522000', '乙醇'); -INSERT INTO `acceptance_record_form` VALUES ('FCA7C1EFF0CE810E8094BB17EDC19502', '合格', NULL, '2023-06-14 11:04:51.533000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.290000', '2023-06-14 11:04:51.533000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.533000', '去甲奥氮平'); +INSERT INTO `acceptance_record_form` VALUES ('04C989B7E833B5439C01871637EAEC54', '合格', NULL, '2023-06-14 11:04:51.543000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'EBD80D1F7717ED4C65AB98D3534CD62A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.534000', '2023-06-14 11:04:51.543000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 0, NULL, '管理员', '2023-06-14 11:04:51.543000', '扎来普隆', NULL); +INSERT INTO `acceptance_record_form` VALUES ('067FDAABDED95ED626A757CDB920158A', '合格', NULL, '2023-06-14 11:04:51.520000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0199C4BCB3826CA513564CE9B75D412D', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.845000', '2023-06-14 11:04:51.520000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 0, NULL, '管理员', '2023-06-14 11:04:51.520000', '2-氯地西泮', NULL); +INSERT INTO `acceptance_record_form` VALUES ('084DAC178E70064C0CDFCF429CE02F44', '合格', NULL, '2023-06-14 11:04:51.537000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:03.672000', '2023-06-14 11:04:51.537000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.537000', '去甲奥氮平', NULL); +INSERT INTO `acceptance_record_form` VALUES ('16B23550233AEC8EB8184FF5F16F0529', '合格', '2023-05-29 17:39:51.759000', '2023-05-29 17:39:25.034000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:39:31.232', '29466290A613CB069621FAAAD17688F7', NULL, '2023-05-29 17:39:43.322000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:28:31.722000', '2023-05-29 17:39:51.759000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:39:25.034000', '喷他咗欣', NULL); +INSERT INTO `acceptance_record_form` VALUES ('1EF43D46A4FE92FB3C3BDE922574ED5C', '合格', NULL, '2023-06-14 11:04:51.535000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'BB49662288F656EC7803F65D1FFA29F3', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:03.678000', '2023-06-14 11:04:51.536000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.535000', '苯巴比妥-d5 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('333D30D32BFF2585FA83711900B853B7', '合格', NULL, '2023-06-14 11:04:51.528000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.295000', '2023-06-14 11:04:51.528000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.528000', ' 普拉西泮', NULL); +INSERT INTO `acceptance_record_form` VALUES ('541879933DCB94ABAFD2FB84544865AB', '合格', NULL, '2023-06-14 11:04:51.530000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.294000', '2023-06-14 11:04:51.530000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.530000', '地佐辛', NULL); +INSERT INTO `acceptance_record_form` VALUES ('56F0D3C6EC6093C85CBE8AA9650EAFF6', '合格', '2023-05-29 17:33:22.499000', '2023-05-29 17:32:55.694000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:33:01.852', '7E4B948494D4ABD162D0E96D24E3D76C', NULL, '2023-05-29 17:33:13.023000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:28:31.724000', '2023-05-29 17:33:22.500000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:32:55.694000', '抽纸', NULL); +INSERT INTO `acceptance_record_form` VALUES ('57EFDA9C852F8EB282DAA0FF472D46D7', '合格', NULL, '2023-06-14 11:04:51.513000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E4B948494D4ABD162D0E96D24E3D76C', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.846000', '2023-06-14 11:04:51.518000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.513000', '抽纸', NULL); +INSERT INTO `acceptance_record_form` VALUES ('5C7C9EF6B89A391F7C94F9BBC96E8B71', '合格', NULL, '2023-06-14 11:04:51.545000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '62B039CEBA75E2D8680D8B1A8B2B37F0', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.532000', '2023-06-14 11:04:51.545000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.545000', '咖啡因', NULL); +INSERT INTO `acceptance_record_form` VALUES ('60A8E7F0DE18C0D9206E6F3345D10D43', '合格', NULL, '2023-06-14 11:04:51.524000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'E41C450FF033E1199EF5EF44919F8154', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.842000', '2023-06-14 11:04:51.524000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.524000', '农夫山泉矿泉水', NULL); +INSERT INTO `acceptance_record_form` VALUES ('7544E8FE033671B691F2BCF1593D28BD', '验收合格', '2023-05-30 11:28:45.634000', '2023-05-29 17:44:54.262000', NULL, '4743bf078d33bf068ca69bc168bda440', NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:14.155', '659CDA042302E614069BCAA06ED8E646', NULL, '2023-05-30 11:28:22.760000', 'fdf8547cb203429eed84606be4755ec9', '1', '1', '1', '2023-05-29 17:44:14.843000', '2023-05-30 11:28:45.635000', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 4, NULL, '试剂耗材管理员', '2023-05-29 17:44:54.262000', '2-羟基乙基氟安定 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('75E5815B74DC0429BFF50E9C9FB55F59', '合格', NULL, '2023-06-14 11:04:51.553000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7FAE89E61DB755E806DE52B036983137', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.530000', '2023-06-14 11:04:51.553000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.553000', '丙泊酚', NULL); +INSERT INTO `acceptance_record_form` VALUES ('77F0A3E4DAF31C3AC611BDE9AC306E01', '合格', NULL, '2023-06-14 11:04:51.550000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E4B948494D4ABD162D0E96D24E3D76C', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:34:47.531000', '2023-06-14 11:04:51.550000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.550000', '抽纸', NULL); +INSERT INTO `acceptance_record_form` VALUES ('8251DDF8A33668574197D1E45198D2B9', '合格', NULL, '2023-06-14 11:04:51.541000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:43:14.081000', '2023-06-14 11:04:51.541000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.541000', 'α-羟基咪哒唑仑 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('85999D4C99A0A69637323DB72580AA68', '合格', NULL, '2023-06-14 11:04:51.526000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.840000', '2023-06-14 11:04:51.526000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.526000', '地佐辛', NULL); +INSERT INTO `acceptance_record_form` VALUES ('8E1DED355AD33C9210016F45E92ACFB5', '验收合格', NULL, '2023-05-29 17:45:03.380000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:16.09', '3B0060DD8BA7C61FB237BF83017D294E', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:28:31.725000', '2023-05-29 17:45:16.091000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:03.380000', '乙醇', NULL); +INSERT INTO `acceptance_record_form` VALUES ('9097BCF87BC550ACBB9C18C8CC5C4A42', '合格', NULL, '2023-06-14 11:04:51.539000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '659CDA042302E614069BCAA06ED8E646', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:44:00.464000', '2023-06-14 11:04:51.539000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.539000', '2-羟基乙基氟安定 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('A57B868D5964C7C0EAA95AD5BE46CAB7', '验收合格', NULL, '2023-05-29 17:45:06.009000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:18.02', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.845000', '2023-05-29 17:45:18.020000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:06.009000', '地佐辛', NULL); +INSERT INTO `acceptance_record_form` VALUES ('B0774949A04AF2C34F1FC8EE463411FC', '验收合格', NULL, '2023-05-29 17:45:08.123000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:20.002', 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.842000', '2023-05-29 17:45:20.002000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:08.123000', '去甲奥氮平', NULL); +INSERT INTO `acceptance_record_form` VALUES ('BB7BCA1334B3B8FE9643AD23A38F1D2D', '合格', NULL, '2023-06-14 11:04:51.531000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.292000', '2023-06-14 11:04:51.532000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.531000', 'α-羟基咪哒唑仑 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('DA5CDD3B3B2228DBE04D1F2DCD680901', '验收合格', NULL, '2023-05-29 17:45:10.147000', NULL, NULL, NULL, NULL, NULL, 'fa55f4a19a3ac4fec46852d0fe042947', '2023-05-29 17:45:21.876', '7E978E1590980C6BB78B6395D1E8EEE8', NULL, NULL, NULL, '0', '0', '1', '2023-05-29 17:44:14.846000', '2023-05-29 17:45:21.876000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '合格', '', '合格', '', '合格', '', '合格', '', '合格', '', 'C75DBAB56358B26EB65DBD3A6C54454E', 2, NULL, '试剂耗材管理员', '2023-05-29 17:45:10.147000', 'α-羟基咪哒唑仑 ', NULL); +INSERT INTO `acceptance_record_form` VALUES ('EB3E9C053653002AFBACF831467E9EBC', '合格', NULL, '2023-06-14 11:04:51.522000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '3B0060DD8BA7C61FB237BF83017D294E', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:59:10.843000', '2023-06-14 11:04:51.522000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.522000', '乙醇', NULL); +INSERT INTO `acceptance_record_form` VALUES ('FCA7C1EFF0CE810E8094BB17EDC19502', '合格', NULL, '2023-06-14 11:04:51.533000', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'B062391CC941FB47A2F2468FEB9A6081', NULL, NULL, NULL, '0', '0', '0', '2023-05-30 09:50:41.290000', '2023-06-14 11:04:51.533000', '1', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', '合格', '1', 'C75DBAB56358B26EB65DBD3A6C54454E', 1, NULL, '管理员', '2023-06-14 11:04:51.533000', '去甲奥氮平', NULL); + +-- ---------------------------- +-- Table structure for acceptance_sign_for +-- ---------------------------- +DROP TABLE IF EXISTS `acceptance_sign_for`; +CREATE TABLE `acceptance_sign_for` ( + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `quantity` int(11) NULL DEFAULT NULL COMMENT '验收种数', + `warehousing_record_form_id` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签收记录表ID', + `status` int(255) NULL DEFAULT NULL COMMENT '状态\r\n', + `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 '--创建人', + `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '--修改人', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of acceptance_sign_for +-- ---------------------------- -- ---------------------------- -- Table structure for application_for_use @@ -107,7 +128,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, + `experiment_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 @@ -131,6 +152,7 @@ INSERT INTO `application_for_use` VALUES ('2023-06-11 15:38:16.965000', '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', 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 (NULL, '1', 0, '8F62462441F7C733D8FAB8B866D82A65', NULL, NULL, NULL, '2023-06-22 11:19:38.611000', '2023-06-22 11:19:38.611000', '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); @@ -388,6 +410,7 @@ INSERT INTO `centralized_request` VALUES ('38465D936C66A4A880606FBA21E6AA72', 'b INSERT INTO `centralized_request` VALUES ('3A2E32F8C5DF24EAA2238ACE3BEFB9A3', '6c847974320c7cb184228d53eea19114', NULL, NULL, 0, '2023-05-30 11:30:53.775000', '2023-05-30 11:30:53.775000', '6c847974320c7cb184228d53eea19114', '6c847974320c7cb184228d53eea19114', NULL, '123456', 0, NULL, NULL, NULL, NULL); INSERT INTO `centralized_request` VALUES ('406E052CEC559F1D130D2B44A3D045AB', 'bf8c774fc2f0ca1cba72cd4dcaa12314', '2023-05-30 09:31:24.937000', '90DDAA39380AEEBD63D559F50A98591F', 4, '2023-05-30 09:31:24.930000', '2023-05-30 09:33:28.264000', 'bf8c774fc2f0ca1cba72cd4dcaa12314', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, '分中心人员测试2', 1, NULL, 'fdf8547cb203429eed84606be4755ec9', '2023-05-30 09:31:35.846000', NULL); INSERT INTO `centralized_request` VALUES ('56938809CEFDE00D979AE588A00B1E3D', '1edaef1e50c39f7ac7530cd98561f943', '2023-05-29 17:24:52.643000', '24431F5121E142A3A306381382596E44', 4, '2023-05-29 17:24:52.628000', '2023-05-29 17:27:19.919000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, '分中心人员测试0', 1, NULL, 'fdf8547cb203429eed84606be4755ec9', '2023-05-29 17:25:51.909000', NULL); +INSERT INTO `centralized_request` VALUES ('7A1AEDDC435F613A7AF084274300A4E8', '1', NULL, NULL, 0, '2023-06-22 11:18:08.276000', '2023-06-22 11:18:08.276000', '1', '1', NULL, '管理员', 0, NULL, NULL, NULL, NULL); INSERT INTO `centralized_request` VALUES ('879F9C9B3FDF76180A7805979BD5A67B', '1edaef1e50c39f7ac7530cd98561f943', '2023-05-30 09:56:05.299000', 'EA9EDBCBAF0943528E16E2DBC5BA5902', 4, '2023-05-30 09:56:05.275000', '2023-05-30 09:57:48.008000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, '分中心人员测试0', 1, NULL, 'fdf8547cb203429eed84606be4755ec9', '2023-05-30 09:56:49.830000', NULL); INSERT INTO `centralized_request` VALUES ('8CC2C5BD878D142BD05955A4230D8E9D', 'bf8c774fc2f0ca1cba72cd4dcaa12314', '2023-05-30 09:39:06.746000', '7B3A797F4C62186363AF6B7623426165', 4, '2023-05-30 09:39:06.734000', '2023-05-30 09:40:23.777000', 'bf8c774fc2f0ca1cba72cd4dcaa12314', 'fa55f4a19a3ac4fec46852d0fe042947', NULL, '分中心人员测试2', 1, NULL, 'fdf8547cb203429eed84606be4755ec9', '2023-05-30 09:39:29.571000', NULL); INSERT INTO `centralized_request` VALUES ('8E91E91F93092F79A0555941AC297843', 'BC1A096180973C5EA652C9787F5A155A', '2023-05-30 09:34:04.410000', NULL, -2, '2023-05-30 09:34:04.405000', '2023-05-30 09:39:56.401000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL, '员工审核员1', 0, '不通过', 'BC1A096180973C5EA652C9787F5A155A', '2023-05-30 09:39:56.401000', NULL); @@ -537,8 +560,16 @@ CREATE TABLE `decentralize_details` ( -- ---------------------------- -- Records of decentralize_details -- ---------------------------- +INSERT INTO `decentralize_details` VALUES ('451e96f7500a2a421ed087aa514c8135', 'C', '试剂', '6502B85EC6B903856AA5DB16718175BF', NULL, '1', 0000000002, '3B0060DD8BA7C61FB237BF83017D294E', '酒精', '350ml', '100', NULL, 0000010.00, '2023-06-22 10:45:23.937000', '2023-06-22 10:56:24.540000', '1', '1', '1', 'wind', '酒精', '常规贮存', NULL, '瓶', '乙醇', NULL, '无', '000001', '6921168511281', NULL); +INSERT INTO `decentralize_details` VALUES ('5c14b01a26328c551818910cfd300db3', '小米', '试剂', '6502B85EC6B903856AA5DB16718175BF', NULL, '10', 0000000001, '4B0087DD2C497D9B367CCF3DC6C7A332', '一般试剂', '0.5 g', '44.99', NULL, 0000120.00, '2023-06-22 10:52:58.833000', '2023-06-22 10:52:58.833000', '1', '1', '1', 'ch3', '酒精', '常规贮存', NULL, '瓶', '乙醇', NULL, '无色液体', '无', NULL, NULL); +INSERT INTO `decentralize_details` VALUES ('671D559B7D9CE7EC64D3AA2F0C422A11', '黄果树', '耗材', '6502B85EC6B903856AA5DB16718175BF', NULL, '1', 0000000001, '6542BBD6B77066F8D6844DE9F5BA9037', '烟', '1包', '无', '无', 0000014.00, '2023-06-22 10:40:11.861000', '2023-06-22 10:40:11.861000', '1', '1', '无', NULL, '磨砂', '常规贮存', NULL, '盒', '黄果树香烟', NULL, '香烟', NULL, '6901028039741', NULL); +INSERT INTO `decentralize_details` VALUES ('871c69ce4a5ea704e761ef4edbc7b492', '华为', '耗材', '6502B85EC6B903856AA5DB16718175BF', NULL, '50', 0000000001, '6FB540090451DE58CA6469F95BE77237', '一般耗材', '一双', '0', NULL, 0000065.00, '2023-06-22 10:56:18.939000', '2023-06-22 10:56:18.939000', '1', '1', '无', 'asd', '手套', '常规贮存', NULL, '双', '手套', NULL, '实验手套', '无', NULL, NULL); INSERT INTO `decentralize_details` VALUES ('87EF8A03A040FD940D5D6EF986747E85', '黄果树', '耗材', '5A99378F3D767E847CA4A291B14FE0AC', NULL, '1', 0000000100, '6542BBD6B77066F8D6844DE9F5BA9037', '烟', '1包', '无', '无', 0000014.00, '2023-05-31 16:43:44.710000', '2023-05-31 16:44:30.066000', '1edaef1e50c39f7ac7530cd98561f943', 'cc65f15f8ca32480b626a3dbe9a031d4', '抽烟', NULL, '磨砂', '常规贮存', '需要抽烟', '盒', '黄果树香烟', '0436B566A1CF1756E19016DA6DB91286', '香烟', NULL, '6901028039741', NULL); +INSERT INTO `decentralize_details` VALUES ('9C459CB93F6F57542BB39EFE47A70887', 'ACC', '试剂', 'BFD6996D112078DDB0D45D549C1F9A12', NULL, '1', 0000000010, NULL, '酒精', '200ML', '无', '1', 0000005.00, '2023-06-22 10:08:05.450000', '2023-06-22 10:08:05.450000', '1', '1', '5', NULL, 'ALISA', '常规贮存', NULL, '箱', '酒精', NULL, NULL, '001', '001', '优化级纯试剂(GR)'); INSERT INTO `decentralize_details` VALUES ('B0625923A2EF3E5B8446E5DB09FB9AB6', '小米', '试剂', 'E7B6138C15C35FBEDEE62C97845A8D7C', NULL, '10', 0000000003, '4B0087DD2C497D9B367CCF3DC6C7A332', '一般试剂', '0.5 g', '44.99', NULL, 0000120.00, '2023-05-30 09:28:06.823000', '2023-05-30 09:28:06.823000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', '请求', 'ch3', '酒精', '常规贮存', NULL, '瓶', '乙醇', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `decentralize_details` VALUES ('C323DAD2DBFDA63DFB69178EC644B544', '黄果树', '耗材', '8BB9931E9A82A4349FC3492DF1A85BAF', NULL, '1', 0000000004, '6542BBD6B77066F8D6844DE9F5BA9037', '烟', '1包', '无', '无', 0000014.00, '2023-06-22 10:26:37.765000', '2023-06-22 10:26:37.765000', '1', '1', '无', NULL, '磨砂', '常规贮存', NULL, '盒', '黄果树香烟', NULL, '香烟', NULL, '6901028039741', NULL); +INSERT INTO `decentralize_details` VALUES ('CA112813E2C827218DE64419FEE098EC', '黄果树', '耗材', '30C36A9A6426812E4ADAFED1BA0A3E87', NULL, '1', 0000000001, '6542BBD6B77066F8D6844DE9F5BA9037', '烟', '1包', '无', '无', 0000014.00, '2023-06-22 10:17:43.208000', '2023-06-22 10:17:43.208000', '1', '1', '无', NULL, '磨砂', '常规贮存', NULL, '盒', '黄果树香烟', NULL, '香烟', NULL, '6901028039741', NULL); +INSERT INTO `decentralize_details` VALUES ('D2E360BFAA1C6EAE1482B89141003ADF', '黄果树', '耗材', '38D7E10983CF2399DC8FBC6B98BBBEB4', NULL, '1', 0000000001, '6542BBD6B77066F8D6844DE9F5BA9037', '烟', '1包', '无', '无', 0000014.00, '2023-06-22 10:09:19.853000', '2023-06-22 10:09:19.853000', '1', '1', '1', NULL, '磨砂', '常规贮存', NULL, '盒', '黄果树香烟', NULL, '香烟', NULL, '6901028039741', NULL); INSERT INTO `decentralize_details` VALUES ('F86B4275D2CA42561C2199C34AD11CC5', '小米', '试剂', '231868D7A1C2C010B21574C0F6DEBEC1', NULL, '10', 0000000003, '4B0087DD2C497D9B367CCF3DC6C7A332', '一般试剂', '0.5 g', '44.99', NULL, 0000120.00, '2023-05-30 09:24:57.358000', '2023-05-30 09:24:57.358000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', '用途', 'ch3', '酒精', '常规贮存', '备注', '瓶', '乙醇', NULL, NULL, NULL, NULL, NULL); -- ---------------------------- @@ -581,7 +612,13 @@ CREATE TABLE `decentralized_request` ( -- Records of decentralized_request -- ---------------------------- INSERT INTO `decentralized_request` VALUES ('231868D7A1C2C010B21574C0F6DEBEC1', 'BC1A096180973C5EA652C9787F5A155A', NULL, NULL, NULL, '不通过', NULL, NULL, 0, NULL, NULL, '2023-05-30 09:27:51.083000', NULL, NULL, NULL, NULL, NULL, 'BC1A096180973C5EA652C9787F5A155A', NULL, NULL, -2, '2023-05-30 09:24:57.342000', '2023-05-30 09:27:51.083000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL, '2023-05-30 09:26:01.753000', NULL); +INSERT INTO `decentralized_request` VALUES ('30C36A9A6426812E4ADAFED1BA0A3E87', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, '2023-06-22 10:17:43.204000', '2023-06-22 10:17:43.204000', '1', '1', NULL, NULL, NULL); +INSERT INTO `decentralized_request` VALUES ('38D7E10983CF2399DC8FBC6B98BBBEB4', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2023-06-22 10:09:19.86', NULL, NULL, NULL, NULL, 1, '2023-06-22 10:09:19.845000', '2023-06-22 10:09:19.863000', '1', '1', NULL, '2023-06-22 10:09:19.860000', NULL); INSERT INTO `decentralized_request` VALUES ('5A99378F3D767E847CA4A291B14FE0AC', '1edaef1e50c39f7ac7530cd98561f943', NULL, '1', '2023-05-31 16:44:30.038000', NULL, NULL, NULL, 1, 1, 1, '2023-05-31 16:43:53.946000', '2023-05-31 16:44:15.185000', '2023-05-31 16:44:23.524000', NULL, '2023-05-31 16:43:44.716', 'cc65f15f8ca32480b626a3dbe9a031d4', 'fdf8547cb203429eed84606be4755ec9', '1edaef1e50c39f7ac7530cd98561f943', '6dbeaa31c66301796536230d36587145', 6, '2023-05-31 16:43:44.694000', '2023-05-31 16:47:10.468000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', '4743bf078d33bf068ca69bc168bda440', '2023-05-31 16:43:44.716000', NULL); +INSERT INTO `decentralized_request` VALUES ('6502B85EC6B903856AA5DB16718175BF', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, '2023-06-22 10:40:11.853000', '2023-06-22 10:40:11.853000', '1', '1', NULL, NULL, NULL); +INSERT INTO `decentralized_request` VALUES ('8BB9931E9A82A4349FC3492DF1A85BAF', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, '2023-06-22 10:26:37.760000', '2023-06-22 10:26:37.760000', '1', '1', NULL, NULL, NULL); +INSERT INTO `decentralized_request` VALUES ('BFD6996D112078DDB0D45D549C1F9A12', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, '2023-06-22 10:08:05.429000', '2023-06-22 10:12:52.185000', '1', '1', NULL, '2023-06-22 10:12:52.185000', NULL); +INSERT INTO `decentralized_request` VALUES ('CACD66E8755823156AAD0D144C8DB9B2', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, '2023-06-22 10:16:16.608000', '2023-06-22 10:16:16.608000', '1', '1', NULL, NULL, NULL); INSERT INTO `decentralized_request` VALUES ('E7B6138C15C35FBEDEE62C97845A8D7C', 'BC1A096180973C5EA652C9787F5A155A', NULL, NULL, NULL, '通过', NULL, NULL, 1, NULL, NULL, '2023-05-30 09:28:20.741000', NULL, NULL, NULL, '2023-05-30 09:28:06.832', NULL, 'BC1A096180973C5EA652C9787F5A155A', NULL, NULL, 2, '2023-05-30 09:28:06.815000', '2023-05-30 09:28:20.742000', 'BC1A096180973C5EA652C9787F5A155A', 'BC1A096180973C5EA652C9787F5A155A', NULL, '2023-05-30 09:28:06.832000', NULL); -- ---------------------------- @@ -697,6 +734,7 @@ INSERT INTO `details_of_centralized` VALUES ('B258508951AA7C8F0CB6AD5C276EC753', INSERT INTO `details_of_centralized` VALUES ('BFE0055039CEE7042C630004AAD3D7B1', '3A2E32F8C5DF24EAA2238ACE3BEFB9A3', '2023-25', NULL, '29466290A613CB069621FAAAD17688F7', '23', '2023-05-30 11:30:53.781000', '2023-05-30 11:30:53.781000', '6c847974320c7cb184228d53eea19114', '6c847974320c7cb184228d53eea19114', NULL, NULL, NULL, 00000000023, NULL, NULL, '23'); INSERT INTO `details_of_centralized` VALUES ('C7E8DAABB1A1587B9C1DAEBBD485E5E9', 'CAB97D0E0D6EE6FB8AF32D579C65891A', '2023-17', 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002, '7FAE89E61DB755E806DE52B036983137', '无', '2023-05-30 09:28:37.437000', '2023-05-30 09:32:07.959000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', '675ABAAF3006D0B52FE4E24DEFB4BB98', NULL, NULL, 00000000002, NULL, NULL, '无'); INSERT INTO `details_of_centralized` VALUES ('CD7097A9FC69AD4557BD9A1D5433265F', 'CAB97D0E0D6EE6FB8AF32D579C65891A', '2023-47', 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000150, 'E41C450FF033E1199EF5EF44919F8154', '无', '2023-05-30 09:28:37.436000', '2023-05-30 09:32:07.961000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', 'C0FAF5828079E41CA6A09EB66F087552', NULL, NULL, 00000000150, NULL, NULL, '无'); +INSERT INTO `details_of_centralized` VALUES ('DF6DF39C03176AC532C9EABD6DDAC05A', '7A1AEDDC435F613A7AF084274300A4E8', '2023-1', NULL, 'D68FF5977832203653F0B838C1FE9D40', NULL, '2023-06-22 11:18:08.287000', '2023-06-22 11:18:08.287000', '1', '1', NULL, NULL, NULL, 00000000001, NULL, NULL, '1'); INSERT INTO `details_of_centralized` VALUES ('E085C442C15842CF2D9E027FA06E4301', '406E052CEC559F1D130D2B44A3D045AB', '2023-3', 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002, '62B039CEBA75E2D8680D8B1A8B2B37F0', '无', '2023-05-30 09:31:24.931000', '2023-05-30 09:32:07.955000', 'bf8c774fc2f0ca1cba72cd4dcaa12314', 'fa55f4a19a3ac4fec46852d0fe042947', '5EAEA245F7577FF2344041E688F7C83F', NULL, NULL, 00000000002, NULL, NULL, '无'); INSERT INTO `details_of_centralized` VALUES ('E0FA841B52EFBE50940A3A18325D26E4', 'FDADAAC15633048D8C7BCC2DA207A49B', '2023-34', 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001, 'EBD80D1F7717ED4C65AB98D3534CD62A', '无', '2023-05-29 17:46:53.058000', '2023-05-30 09:32:07.965000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', 'F1F69DEF1B88D61C28A97DB252229D4F', NULL, NULL, 00000000001, NULL, NULL, '无'); INSERT INTO `details_of_centralized` VALUES ('E51D1A8FA5917545415B24FB8BB1AEA9', 'A83D406B90483CB3BAE7157A56F7F562', '2023-12', 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001, '7CBFA2947A5B622FFAAEF3E87FBDBA8A', '无', '2023-05-30 09:47:25.333000', '2023-05-30 09:48:24.231000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', '818B5B2587D96CBECDBF72C982C4AFA9', NULL, NULL, 00000000001, NULL, NULL, '无'); @@ -1243,22 +1281,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-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); +INSERT INTO `reagent_consumable_inventory` VALUES ('02D3D8BAAC41BDCDA7C0BFC5FE7C74BE', '0199C4BCB3826CA513564CE9B75D412D', '2-氯地西泮', 'Cerilliant', '标准物质', NULL, NULL, '1mL,1mg/mL于乙腈', '2023-05-30 09:59:10.558000', '2023-06-22 17:28:00.007000', '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-22 17:28:00.010000', '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-22 17:28:00.017000', '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-22 17:28:00.023000', '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-22 17:28:00.030000', '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-22 17:28:00.035000', '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-22 17:28:00.041000', '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-22 17:28:00.048000', '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-22 17:28:00.054000', '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-22 17:28:00.060000', '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-22 17:28:00.112000', '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-22 17:28:00.066000', '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-22 17:28:00.072000', '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-22 17:28:00.078000', '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-22 17:28:00.084000', '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-22 17:28:00.090000', '6dbeaa31c66301796536230d36587145', NULL, '16.99', NULL, 2, '一般标准物质', '1', NULL, NULL, '毒品', '常规贮存', '天津一方代理', '瓶', 'qqq', 873.00, NULL, 1, '库存充足', 1, NULL, '17', NULL); -- ---------------------------- -- Table structure for reagent_consumables @@ -1411,6 +1449,7 @@ INSERT INTO `reagent_consumables_set` VALUES (1, 'B062391CC941FB47A2F2468FEB9A60 INSERT INTO `reagent_consumables_set` VALUES (399, '7E4B948494D4ABD162D0E96D24E3D76C', '2023-06-11 15:40:42.479000', '2023-06-11 15:40:42.479000', '1', '1', 'D608CE21886470F37067072791C2B865', '300抽', NULL, 1, NULL, '16A894BA20C1EDBCCBAA42DF45187C74', NULL, NULL, NULL); INSERT INTO `reagent_consumables_set` VALUES (1, '62B039CEBA75E2D8680D8B1A8B2B37F0', '2023-05-31 10:53:14.981000', '2023-05-31 10:53:48.014000', '1edaef1e50c39f7ac7530cd98561f943', 'fa55f4a19a3ac4fec46852d0fe042947', 'DDB435FE509FB69564E7AD766244FF08', '100mg', NULL, 1, '54B119008A3CBF6A99F3BCE9BD48FBF6', '7DC024FC9BC5156D8DA274FE8F6738E0', '44462ED612629C46403B6B9C72B5B417', 1, 'C53E9577CC11FE8E0A581F6264041077'); INSERT INTO `reagent_consumables_set` VALUES (201, '3B0060DD8BA7C61FB237BF83017D294E', '2023-06-11 15:42:16.172000', '2023-06-11 15:42:16.172000', '1', '1', 'E5C6AD6D580EF3CE188CD015A48317D9', '350ml', NULL, 1, NULL, 'BC31F6C21F90D3BB078015187E88F330', NULL, NULL, NULL); +INSERT INTO `reagent_consumables_set` VALUES (1, 'EBD80D1F7717ED4C65AB98D3534CD62A', '2023-06-22 11:19:38.613000', '2023-06-22 11:19:38.613000', '1', '1', 'EB22C8162EDCC65D242AA952E1C7CAE6', '100mg', NULL, 0, '4C4FE7D245BDA00ED1FB1E8B872A15FD', '8F62462441F7C733D8FAB8B866D82A65', 'D89E2506CA1EC875888A8C90181A35BB', NULL, NULL); INSERT INTO `reagent_consumables_set` VALUES (300, 'E41C450FF033E1199EF5EF44919F8154', '2023-06-11 15:38:16.941000', '2023-06-11 15:38:16.941000', '1', '1', 'F3B2A09555D53ECC68DB18069BC1CBB9', '380ml', NULL, 1, NULL, '6B5367184F8464D5D38E4D31DB4A3D46', NULL, NULL, NULL); -- ---------------------------- @@ -1818,44 +1857,47 @@ CREATE TABLE `warehousing_content` ( `status` int(6) NULL DEFAULT NULL, `warning_value` int(255) NULL DEFAULT NULL, `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `last_storage_location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `lattice_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '格子ID', + `box_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '柜子ID', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of warehousing_content -- ---------------------------- -INSERT INTO `warehousing_content` VALUES ('014008D4E6EABE6A53F77E25CC9A3803', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 2, 2, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.840000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '85999D4C99A0A69637323DB72580AA68', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '680D7776698777D487CDC34974B2CA97', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('035C287D3BE0B39D6DBE01C9D605B1B6', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.842000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'B0774949A04AF2C34F1FC8EE463411FC', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '5C5631A59F52F940281B7F75E301EC4C', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('07EC5E15578714CA543CC246AD45FCD1', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:43:15.419000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '8251DDF8A33668574197D1E45198D2B9', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'F2DFD4FF156B303CE07C4D5FD557083E', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('0FAACFAC9BC828C3E55F44CBAFEDA501', '2-羟基乙基氟安定 ', '659CDA042302E614069BCAA06ED8E646', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.844000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', '7544E8FE033671B691F2BCF1593D28BD', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '8AAEED25CC5400E3799A31E23974EA80', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('1A45A142D72055E5F6D06584A2BF259A', '喷他咗欣', '29466290A613CB069621FAAAD17688F7', 2, 2, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.723000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '16B23550233AEC8EB8184FF5F16F0529', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'DD728C6A6E78582B998D1F04048C67A9', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('1AD3C37B1003AE02984BA08F717A8199', '丙泊酚', '7FAE89E61DB755E806DE52B036983137', 2, 2, NULL, '2023-05-30 09:33:28.275000', '2023-05-30 09:34:47.530000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '75E5815B74DC0429BFF50E9C9FB55F59', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '398EDB46D081FEEF2E7601F57EEC3021', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('1D60C887AF5855BD649DD3A096AE1989', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 250, 250, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.066000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'FA8FE26D295EC96F87242EC273D38F82', NULL, 10, '6921168511280'); -INSERT INTO `warehousing_content` VALUES ('26B652DF78DC27103995EDDE75347E37', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.842000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '60A8E7F0DE18C0D9206E6F3345D10D43', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '2D9BB31EE72A17769EAC9C0EEF3DDD9E', 1, 10, '6921168511280'); -INSERT INTO `warehousing_content` VALUES ('39B7E22373F50D41A4DD789A1752FB69', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 100, 100, NULL, '2023-05-30 09:57:48.021000', '2023-05-30 09:59:10.844000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', 'EB3E9C053653002AFBACF831467E9EBC', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'C271AD499E1F555F82A37C4B185162E3', 1, 1, '6921168511281'); -INSERT INTO `warehousing_content` VALUES ('3D6B8EC453BA4088A6CF8929FE659D71', '黄果树香烟', '6542BBD6B77066F8D6844DE9F5BA9037', 100, 50, NULL, '2023-05-31 16:47:10.479000', '2023-05-31 16:47:34.801000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '82DD9FE997B8A78C0993F31254A77504', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '0436B566A1CF1756E19016DA6DB91286', NULL, NULL, '6901028039741'); -INSERT INTO `warehousing_content` VALUES ('3DA47CC29C128E494EB7F20A2BEFE8E0', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 1, 1, NULL, '2023-05-30 09:48:58.612000', '2023-05-30 09:50:41.291000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', 'FCA7C1EFF0CE810E8094BB17EDC19502', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '6A688BB04DD9DFEB3BAB9609A6E5A2E9', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('4A4793A5492DA68C8378841E78200F33', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-30 09:48:58.612000', '2023-05-30 09:50:41.293000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', 'BB7BCA1334B3B8FE9643AD23A38F1D2D', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '89C3FC58BB7101179E31E793CB9C36F3', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('50580BA87A81F1C73790D9B66F520508', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 100, 100, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.532000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '77F0A3E4DAF31C3AC611BDE9AC306E01', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'D006A7D0EF4DCC7327796BD6CB39E04E', 1, 10, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('57F7C8EEE765DA3B1A8364480650FF03', '咖啡因', '62B039CEBA75E2D8680D8B1A8B2B37F0', 2, 2, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.533000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '5C7C9EF6B89A391F7C94F9BBC96E8B71', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '8BE1810A0CBEC56DA5B0B8D1AF222BE7', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('5D083D62AF7D85BBDB41B4E3F646B7EA', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:42:24.120000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '14B45B488A07D1B857577469AAF98417', NULL, 10, '6921168511280'); -INSERT INTO `warehousing_content` VALUES ('6835D64A1CE3BA6C711E0425D6DFAFB4', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 100, 9, NULL, '2023-05-31 16:54:26.375000', '2023-06-13 16:53:01.275000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', '49BCB60D30D49BBAF40D9751456474D3', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '013CFA76232E047FC1E0955527E363A7', NULL, 10, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('8A3417911F8FD59682DEAA7C221221E4', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 200, 200, NULL, '2023-05-30 09:48:58.610000', '2023-05-30 09:50:40.862000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '3A0166A94821CBE6652C2224E388360F', NULL, 1, '6921168511281'); -INSERT INTO `warehousing_content` VALUES ('97AF490B1C0AFC481B2670055F2F1B7C', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.845000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'A57B868D5964C7C0EAA95AD5BE46CAB7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '9C2AAC2DB55C76A6E80CABC061B5EF1F', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('9CC1210741F405A024F08BFE55532E5F', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 100, 100, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.724000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '56F0D3C6EC6093C85CBE8AA9650EAFF6', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'B48687E69C5DC35DBFDFF8C3BCB61706', 1, NULL, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('9D63DCAF079FD745258A4A32A4CCE7BE', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:42:24.222000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '82517799F1D569BA8AE3625641EB0D03', NULL, 10, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('A8A06B65D1A850F8C60961ACCBDD3540', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 1, 1, NULL, '2023-05-30 09:48:58.613000', '2023-05-30 09:50:41.294000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', '541879933DCB94ABAFD2FB84544865AB', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'A0554799F275F2616B3E245D1659DDAA', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('B481CC454157868DCBB3231242B06FDE', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-29 17:43:20.405000', '2023-05-29 17:44:14.846000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'DA5CDD3B3B2228DBE04D1F2DCD680901', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '9FA559314E17CAC429A4D0F13941D8C5', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('B7C07F578B86AB348FF2C24CF2104CF0', '2-氯地西泮', '0199C4BCB3826CA513564CE9B75D412D', 1, 1, NULL, '2023-05-30 09:57:48.021000', '2023-05-30 09:59:10.845000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '067FDAABDED95ED626A757CDB920158A', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '822488C84BF11701675CC0E0DD3BC6F3', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('B7F5F0C3315B0DA48FFD11AC78412FE7', ' 普拉西泮', '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', 1, 1, NULL, '2023-05-30 09:48:58.611000', '2023-05-30 09:50:41.296000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', '333D30D32BFF2585FA83711900B853B7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '630E00EF5A0475E9DF3FFA4977E8BA8B', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('BE45247E8068A902E6822C92149D774B', '2-羟基乙基氟安定 ', '659CDA042302E614069BCAA06ED8E646', 1, 1, NULL, '2023-05-30 09:40:23.786000', '2023-05-30 09:44:01.108000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '9097BCF87BC550ACBB9C18C8CC5C4A42', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '0687BA149763389557A8CA8F27D81AC9', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('CF5806B3865F657A52A61B441A89CB83', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.847000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '57EFDA9C852F8EB282DAA0FF472D46D7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '75B11A5849666EA1A0708BAE452A7624', 1, 10, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('D77A16F12AFB05705345F9481C33D66B', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 2, 2, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:44:03.673000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '084DAC178E70064C0CDFCF429CE02F44', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'DA722CB7DAF10076A52B7919828756A4', 1, 1, NULL); -INSERT INTO `warehousing_content` VALUES ('DAE4DDC87671D5318026EC115F85DD03', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 5, 5, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.725000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '8E1DED355AD33C9210016F45E92ACFB5', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'CF49BA485520AD26AD37C31C145DD278', 1, NULL, '6921168511281'); -INSERT INTO `warehousing_content` VALUES ('DBCABF3B5B2F6998D5B4BB3FD90E3B11', '苯巴比妥-d5 ', 'BB49662288F656EC7803F65D1FFA29F3', 1, 1, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:44:03.679000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '1EF43D46A4FE92FB3C3BDE922574ED5C', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '33D62D631E326E59314258B545B29A6C', 1, NULL, NULL); -INSERT INTO `warehousing_content` VALUES ('ED74A8BFCD54CCFB7FBED5DAE37B5712', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.612000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '269F1EA1A887717EC270CD1FD6570BB8', NULL, NULL, '6921168511280'); -INSERT INTO `warehousing_content` VALUES ('EFCC734B9FDBEF2E02C630C7FF75DF9F', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:48:58.613000', '2023-05-30 09:50:41.172000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'F1C81B20B13666CCE49D28263E137F1B', NULL, 10, '6901236348857'); -INSERT INTO `warehousing_content` VALUES ('F9193003D3769750BB69411BAF2F2085', '扎来普隆', 'EBD80D1F7717ED4C65AB98D3534CD62A', 1, 1, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.534000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '04C989B7E833B5439C01871637EAEC54', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '81E4E6AE4E637358E41085F3D9098FFA', 1, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('014008D4E6EABE6A53F77E25CC9A3803', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 2, 2, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.840000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '85999D4C99A0A69637323DB72580AA68', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '680D7776698777D487CDC34974B2CA97', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('035C287D3BE0B39D6DBE01C9D605B1B6', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.842000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'B0774949A04AF2C34F1FC8EE463411FC', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '5C5631A59F52F940281B7F75E301EC4C', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('07EC5E15578714CA543CC246AD45FCD1', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:43:15.419000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '8251DDF8A33668574197D1E45198D2B9', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'F2DFD4FF156B303CE07C4D5FD557083E', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('0FAACFAC9BC828C3E55F44CBAFEDA501', '2-羟基乙基氟安定 ', '659CDA042302E614069BCAA06ED8E646', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.844000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', '7544E8FE033671B691F2BCF1593D28BD', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '8AAEED25CC5400E3799A31E23974EA80', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('1A45A142D72055E5F6D06584A2BF259A', '喷他咗欣', '29466290A613CB069621FAAAD17688F7', 2, 2, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.723000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '16B23550233AEC8EB8184FF5F16F0529', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'DD728C6A6E78582B998D1F04048C67A9', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('1AD3C37B1003AE02984BA08F717A8199', '丙泊酚', '7FAE89E61DB755E806DE52B036983137', 2, 2, NULL, '2023-05-30 09:33:28.275000', '2023-05-30 09:34:47.530000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '75E5815B74DC0429BFF50E9C9FB55F59', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '398EDB46D081FEEF2E7601F57EEC3021', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('1D60C887AF5855BD649DD3A096AE1989', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 250, 250, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.066000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'FA8FE26D295EC96F87242EC273D38F82', NULL, 10, '6921168511280', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('26B652DF78DC27103995EDDE75347E37', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.842000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '60A8E7F0DE18C0D9206E6F3345D10D43', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '2D9BB31EE72A17769EAC9C0EEF3DDD9E', 1, 10, '6921168511280', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('39B7E22373F50D41A4DD789A1752FB69', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 100, 100, NULL, '2023-05-30 09:57:48.021000', '2023-05-30 09:59:10.844000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', 'EB3E9C053653002AFBACF831467E9EBC', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'C271AD499E1F555F82A37C4B185162E3', 1, 1, '6921168511281', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('3D6B8EC453BA4088A6CF8929FE659D71', '黄果树香烟', '6542BBD6B77066F8D6844DE9F5BA9037', 100, 50, NULL, '2023-05-31 16:47:10.479000', '2023-05-31 16:47:34.801000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '82DD9FE997B8A78C0993F31254A77504', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '0436B566A1CF1756E19016DA6DB91286', NULL, NULL, '6901028039741', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('3DA47CC29C128E494EB7F20A2BEFE8E0', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 1, 1, NULL, '2023-05-30 09:48:58.612000', '2023-05-30 09:50:41.291000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', 'FCA7C1EFF0CE810E8094BB17EDC19502', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '6A688BB04DD9DFEB3BAB9609A6E5A2E9', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('4A4793A5492DA68C8378841E78200F33', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-30 09:48:58.612000', '2023-05-30 09:50:41.293000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', 'BB7BCA1334B3B8FE9643AD23A38F1D2D', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '89C3FC58BB7101179E31E793CB9C36F3', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('50580BA87A81F1C73790D9B66F520508', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 100, 100, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.532000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '77F0A3E4DAF31C3AC611BDE9AC306E01', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'D006A7D0EF4DCC7327796BD6CB39E04E', 1, 10, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('57F7C8EEE765DA3B1A8364480650FF03', '咖啡因', '62B039CEBA75E2D8680D8B1A8B2B37F0', 2, 2, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.533000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '5C7C9EF6B89A391F7C94F9BBC96E8B71', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '8BE1810A0CBEC56DA5B0B8D1AF222BE7', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('5D083D62AF7D85BBDB41B4E3F646B7EA', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:42:24.120000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '14B45B488A07D1B857577469AAF98417', NULL, 10, '6921168511280', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('6835D64A1CE3BA6C711E0425D6DFAFB4', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 100, 9, NULL, '2023-05-31 16:54:26.375000', '2023-06-13 16:53:01.275000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fdf8547cb203429eed84606be4755ec9', '49BCB60D30D49BBAF40D9751456474D3', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '013CFA76232E047FC1E0955527E363A7', NULL, 10, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('8A3417911F8FD59682DEAA7C221221E4', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 200, 200, NULL, '2023-05-30 09:48:58.610000', '2023-05-30 09:50:40.862000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '3A0166A94821CBE6652C2224E388360F', NULL, 1, '6921168511281', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('97AF490B1C0AFC481B2670055F2F1B7C', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 1, 1, NULL, '2023-05-29 17:43:20.403000', '2023-05-29 17:44:14.845000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'A57B868D5964C7C0EAA95AD5BE46CAB7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '9C2AAC2DB55C76A6E80CABC061B5EF1F', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('9CC1210741F405A024F08BFE55532E5F', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 100, 100, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.724000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '56F0D3C6EC6093C85CBE8AA9650EAFF6', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'B48687E69C5DC35DBFDFF8C3BCB61706', 1, NULL, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('9D63DCAF079FD745258A4A32A4CCE7BE', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:42:24.222000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '82517799F1D569BA8AE3625641EB0D03', NULL, 10, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('A8A06B65D1A850F8C60961ACCBDD3540', '地佐辛', '7CBFA2947A5B622FFAAEF3E87FBDBA8A', 1, 1, NULL, '2023-05-30 09:48:58.613000', '2023-05-30 09:50:41.294000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', '541879933DCB94ABAFD2FB84544865AB', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'A0554799F275F2616B3E245D1659DDAA', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('B481CC454157868DCBB3231242B06FDE', 'α-羟基咪哒唑仑 ', '7E978E1590980C6BB78B6395D1E8EEE8', 1, 1, NULL, '2023-05-29 17:43:20.405000', '2023-05-29 17:44:14.846000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'F0B02676ECD2AE4B24F30FA00E1E6065', 'DA5CDD3B3B2228DBE04D1F2DCD680901', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '9FA559314E17CAC429A4D0F13941D8C5', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('B7C07F578B86AB348FF2C24CF2104CF0', '2-氯地西泮', '0199C4BCB3826CA513564CE9B75D412D', 1, 1, NULL, '2023-05-30 09:57:48.021000', '2023-05-30 09:59:10.845000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '067FDAABDED95ED626A757CDB920158A', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '822488C84BF11701675CC0E0DD3BC6F3', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('B7F5F0C3315B0DA48FFD11AC78412FE7', ' 普拉西泮', '0E3ED61B4A7DD92BEEADD33ABF1CBFDC', 1, 1, NULL, '2023-05-30 09:48:58.611000', '2023-05-30 09:50:41.296000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', '333D30D32BFF2585FA83711900B853B7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '630E00EF5A0475E9DF3FFA4977E8BA8B', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('BE45247E8068A902E6822C92149D774B', '2-羟基乙基氟安定 ', '659CDA042302E614069BCAA06ED8E646', 1, 1, NULL, '2023-05-30 09:40:23.786000', '2023-05-30 09:44:01.108000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '9097BCF87BC550ACBB9C18C8CC5C4A42', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '0687BA149763389557A8CA8F27D81AC9', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('CF5806B3865F657A52A61B441A89CB83', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:57:48.020000', '2023-05-30 09:59:10.847000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'A2EB056774AF5614A8E4D99009CCB80A', '57EFDA9C852F8EB282DAA0FF472D46D7', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '75B11A5849666EA1A0708BAE452A7624', 1, 10, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('D77A16F12AFB05705345F9481C33D66B', '去甲奥氮平', 'B062391CC941FB47A2F2468FEB9A6081', 2, 2, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:44:03.673000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '084DAC178E70064C0CDFCF429CE02F44', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'DA722CB7DAF10076A52B7919828756A4', 1, 1, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('DAE4DDC87671D5318026EC115F85DD03', '乙醇', '3B0060DD8BA7C61FB237BF83017D294E', 5, 5, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.725000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', '8E1DED355AD33C9210016F45E92ACFB5', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'CF49BA485520AD26AD37C31C145DD278', 1, NULL, '6921168511281', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('DBCABF3B5B2F6998D5B4BB3FD90E3B11', '苯巴比妥-d5 ', 'BB49662288F656EC7803F65D1FFA29F3', 1, 1, NULL, '2023-05-30 09:40:23.787000', '2023-05-30 09:44:03.679000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '553F1B17E395FC29EB656EA33A75F007', '1EF43D46A4FE92FB3C3BDE922574ED5C', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '33D62D631E326E59314258B545B29A6C', 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('ED74A8BFCD54CCFB7FBED5DAE37B5712', '农夫山泉矿泉水', 'E41C450FF033E1199EF5EF44919F8154', 200, 200, NULL, '2023-05-29 17:27:19.932000', '2023-05-29 17:28:31.612000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', '47A3B470D4A8E7C65B0C814CD343EAF1', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '269F1EA1A887717EC270CD1FD6570BB8', NULL, NULL, '6921168511280', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('EFCC734B9FDBEF2E02C630C7FF75DF9F', '抽纸', '7E4B948494D4ABD162D0E96D24E3D76C', 200, 200, NULL, '2023-05-30 09:48:58.613000', '2023-05-30 09:50:41.172000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D12CAD131333355DEA6E8A6DF5A3B0CF', NULL, 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, 'F1C81B20B13666CCE49D28263E137F1B', NULL, 10, '6901236348857', NULL, NULL, NULL); +INSERT INTO `warehousing_content` VALUES ('F9193003D3769750BB69411BAF2F2085', '扎来普隆', 'EBD80D1F7717ED4C65AB98D3534CD62A', 1, 1, NULL, '2023-05-30 09:33:28.276000', '2023-05-30 09:34:47.534000', 'fa55f4a19a3ac4fec46852d0fe042947', 'fa55f4a19a3ac4fec46852d0fe042947', 'D1019050B03CB7F2AA275739DE02677B', '04C989B7E833B5439C01871637EAEC54', 'C75DBAB56358B26EB65DBD3A6C54454E', NULL, '81E4E6AE4E637358E41085F3D9098FFA', 1, NULL, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for warehousing_record_form diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/AcceptanceRecordFormController.java b/src/main/java/digital/laboratory/platform/reagent/controller/AcceptanceRecordFormController.java index 6552054..e161401 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/AcceptanceRecordFormController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/AcceptanceRecordFormController.java @@ -2,6 +2,7 @@ package digital.laboratory.platform.reagent.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; +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; @@ -115,19 +116,17 @@ public class AcceptanceRecordFormController { DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); IPage acceptanceRecordFormVOPage = acceptanceRecordFormService.getAcceptanceRecordFormVOPage(page, Wrappers.query() - .like(StrUtil.isNotBlank(reagentConsumableName), "reagent_consumable_name", reagentConsumableName) - .ge(startTime != null, "create_time", startTime) - .le(endTime != null, "create_time", endTime) - .eq(status != null, "status", status) - .orderByDesc("create_time") - , acceptanceSignForId); + .like(StrUtil.isNotBlank(reagentConsumableName), "reagent_consumable_name", reagentConsumableName) + .ge(startTime != null, "create_time", startTime) + .le(endTime != null, "create_time", endTime) + .eq(status != null, "status", status) + .orderByDesc("create_time") + .eq("acceptance_sign_for_id", acceptanceSignForId)); return R.ok(acceptanceRecordFormVOPage); // return R.ok(acceptanceRecordFormService.page(page, Wrappers.query(acceptanceRecordForm))); } - - /** * 录入(验收记录表) * @@ -286,7 +285,11 @@ public class AcceptanceRecordFormController { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); - IPage page1 = acceptanceSignForService.page(page); + QueryWrapper queryWrapper = Wrappers.query().ge(startTime != null, "create_time", startTime) + .le(endTime != null, "create_time", endTime) + .orderByDesc("create_time"); + + IPage page1 = acceptanceSignForService.page(page, queryWrapper); return R.ok(page1); // return R.ok(acceptanceRecordFormService.page(page, Wrappers.query(acceptanceRecordForm))); 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 1a8917a..a31b3ac 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ApplicationForUseController.java @@ -222,7 +222,7 @@ public class ApplicationForUseController { @SysLog("批量提交试剂耗材领用申请表") @PostMapping("/batch/commit") @PreAuthorize("@pms.hasPermission('reagent_application_for_use_commit')") - public R batchCommit(ApplicationForUseBatchDTO applicationForUseBatchDTO, HttpServletRequest theHttpServletRequest) { + public R batchCommit(@RequestBody ApplicationForUseBatchDTO applicationForUseBatchDTO, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/ComplianceCheckController.java b/src/main/java/digital/laboratory/platform/reagent/controller/ComplianceCheckController.java index 3b46fb3..34c670b 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ComplianceCheckController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ComplianceCheckController.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.security.Principal; import java.sql.Date; import java.time.LocalDate; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -393,14 +394,16 @@ public class ComplianceCheckController { Configure config = Configure.builder(). bind("voList", policy).build(); + + Calendar instance = Calendar.getInstance(); + int year = instance.get(Calendar.YEAR); /** * 循环表格 */ XWPFTemplate template = XWPFTemplate.compile(bis, config).render( new HashMap() {{ put("dateOfInspection", LocalDateTimeUtil.format(complianceCheckVO.getDateOfInspection(), "yyyy年MM月dd日")); - put("id", id); - put("size", 1); + put("year", year); put("reagentConsumableName", complianceCheckVO.getReagentConsumableName()); put("brand", complianceCheckVO.getBrand()); put("specificationAndModel", complianceCheckVO.getSpecificationAndModel()); diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/DecentralizedRequestController.java b/src/main/java/digital/laboratory/platform/reagent/controller/DecentralizedRequestController.java index e6e4a8b..bc6c137 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/DecentralizedRequestController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/DecentralizedRequestController.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import digital.laboratory.platform.common.core.util.R; import digital.laboratory.platform.common.log.annotation.SysLog; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; +import digital.laboratory.platform.common.oss.service.OssFile; import digital.laboratory.platform.reagent.dto.AuditAndApproveDTO; import digital.laboratory.platform.reagent.dto.DecentralizedRequestDTO; import digital.laboratory.platform.reagent.dto.PurchaseListDTO; @@ -33,6 +34,7 @@ import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.security.Principal; import java.util.ArrayList; import java.util.List; @@ -64,6 +66,9 @@ public class DecentralizedRequestController { @Autowired private PurchaseListService purchaseListService; + @Autowired + private OssFile ossFile; + /** @@ -344,13 +349,32 @@ public class DecentralizedRequestController { DecentralizedRequest decentralizedRequest = decentralizedRequestService.approveRequest(dlpUser, auditAndApproveDto); - - - if (decentralizedRequest != null) { return R.ok(decentralizedRequest, "审批成功"); } else return R.failed("审批失败"); } + @ApiOperation(value = "试剂/耗材分散采购申请表打印", notes = "试剂/耗材分散采购申请表打印") + @SysLog("试剂/耗材分散采购申请表打印") + @PostMapping("/print") + @PreAuthorize("@pms.hasPermission('purchase_request_print')") + public void bizGetPDFInventory(String id, String type,HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) { + System.out.println("bizApplyWord................."); + Principal principal = theHttpServletRequest.getUserPrincipal(); + DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); + + String applyFileName = "试剂耗材分散采购申请表-" + id; + + String pdfFilePath = "document" + "/" + "DecentralizeRequest" + "/" + id + "/" + applyFileName + ".pdf"; + try { + //直接调用pdf方法 + decentralizedRequestService.purchaseRequestTablePDF(id,type, theHttpServletRequest, httpServletResponse); + ossFile.fileGet(pdfFilePath, httpServletResponse.getOutputStream()); + httpServletResponse.setContentType(applyFileName); + } catch (Exception e) { + System.out.println(String.format("minioFile objectExist() Exception. %s", e.getLocalizedMessage())); + e.printStackTrace(); + } + } } diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java b/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java index 1fdc92c..684ee39 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java @@ -47,14 +47,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.security.Principal; -import java.sql.Date; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * (采购目录) @@ -94,13 +90,13 @@ public class PurchaseCatalogueController { @ApiOperation(value = "分页查询已发布的采购目录明细", notes = "分页查询已发布的采购目录明细") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('reagent_purchase_catalogue_pages')") - public R> getPurchaseCataloguePage(String name,Integer category, HttpServletRequest theHttpServletRequest) { + public R> getPurchaseCataloguePage(String name, Integer category, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); - List list = purchaseCatalogueService.getList(name,category); + List list = purchaseCatalogueService.getList(name, category); return R.ok(list); @@ -398,14 +394,6 @@ public class PurchaseCatalogueController { if (voList.isEmpty()) { throw new RuntimeException("未查询到相关信息"); } - Collections.sort(voList, new Comparator() { - - - @Override - public int compare(CatalogueDetails o1, CatalogueDetails o2) { - return Integer.valueOf(o1.getPurchaseCatalogueNumber().substring(5))- Integer.valueOf(o2.getPurchaseCatalogueNumber().substring(5)); - } - }); String id = IdWorker.get32UUID().toUpperCase(); @@ -446,14 +434,17 @@ public class PurchaseCatalogueController { Configure config = Configure.builder(). bind("voList", policy).build(); + + Calendar instance = Calendar.getInstance(); + + int year = instance.get(Calendar.YEAR); /** * 循环表格 */ XWPFTemplate template = XWPFTemplate.compile(bis, config).render( new HashMap() {{ put("voList", voList); - put("id", purchaseCatalogueVO.getPurchaseCatalogueId()); - put("size", 1); + put("year", year); put("secondaryAuditorName", purchaseCatalogueVO.getAuditorName()); put("auditTimeOfSecondary", LocalDateTimeUtil.format(purchaseCatalogueVO.getAuditTime(), "yyyy年MM月dd日 ")); put("name", LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy年") + "~" + LocalDateTimeUtil.format(LocalDateTime.now().plusYears(1), "yyyy年")); @@ -471,9 +462,10 @@ public class PurchaseCatalogueController { //MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", fisWord); MockMultipartFile mockMultipartFile = new MockMultipartFile("file", applyFileName + ".docx", "image/jpg", fisWord); + Response response = remoteWord2PDFService.word2pdf(mockMultipartFile); - fisWord.close(); + fisWord.close(); ByteArrayOutputStream outPDF = new ByteArrayOutputStream(); IoUtil.copy(response.body().asInputStream(), outPDF, IoUtil.DEFAULT_MIDDLE_BUFFER_SIZE); diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/PurchasingPlanController.java b/src/main/java/digital/laboratory/platform/reagent/controller/PurchasingPlanController.java index 38c850b..9ca668d 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/PurchasingPlanController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/PurchasingPlanController.java @@ -45,6 +45,7 @@ import java.security.Principal; import java.sql.Date; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -123,7 +124,7 @@ public class PurchasingPlanController { @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_get')") - public R> getPurchasingPlanPage(Page page, @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") DateTime startTime, + public R> getPurchasingPlanPage(Page page, @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") DateTime startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") DateTime endTime, HttpServletRequest theHttpServletRequest) { @@ -138,14 +139,14 @@ public class PurchasingPlanController { .le("create_time", endTime).orderByDesc("create_time")); return R.ok(purchasingPlanVOPage); - }else { + } else { - IPage purchasingPlanVOPage = purchasingPlanService.getPurchasingPlanVOPage(page, Wrappers.query() - .orderByDesc("create_time")); + IPage purchasingPlanVOPage = purchasingPlanService.getPurchasingPlanVOPage(page, Wrappers.query() + .orderByDesc("create_time")); - return R.ok(purchasingPlanVOPage); + return R.ok(purchasingPlanVOPage); + } } -} /** * 新增(采购计划) @@ -156,7 +157,7 @@ public class PurchasingPlanController { @ApiOperation(value = "新增(采购计划)", notes = "新增(采购计划) 参数DTO：（detailsOfCentralizedId，quantity = ，）") @SysLog("新增(采购计划)") @PostMapping - @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_add')" ) + @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_add')") public R postAddObject(@RequestBody List purchasingPlanDTOList, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); @@ -348,13 +349,12 @@ public class PurchasingPlanController { * 采购计划打印 * * @param purchasingPlanId - * * @return */ @ApiOperation(value = "采购计划打印", notes = "采购计划打印") @SysLog("采购计划打印") @PostMapping("/print") - @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_print')") + @PreAuthorize("@pms.hasPermission('reagent_purchasing_plan_print')") public void bizGetPDFInventory(String purchasingPlanId, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) { System.out.println("bizApplyWord................."); Principal principal = theHttpServletRequest.getUserPrincipal(); @@ -370,12 +370,12 @@ public class PurchasingPlanController { String id = purchasingPlanVO.getPurchasingPlanId(); - String applyFileName = "采购计划-"+id; + String applyFileName = "采购计划-" + id; - String pdfFilePath = "document" + "/"+"purchasingPlan" + "/" + id + "/" + applyFileName + ".pdf"; + String pdfFilePath = "document" + "/" + "purchasingPlan" + "/" + id + "/" + applyFileName + ".pdf"; try { //直接调用pdf方法 - purchasingPlanTablePDF(purchasingPlanVO,id,theHttpServletRequest,httpServletResponse); + purchasingPlanTablePDF(purchasingPlanVO, id, theHttpServletRequest, httpServletResponse); ossFile.fileGet(pdfFilePath, httpServletResponse.getOutputStream()); httpServletResponse.setContentType(applyFileName); } catch (Exception e) { @@ -392,11 +392,15 @@ public class PurchasingPlanController { ArrayList voList = new ArrayList<>(); + double appropriationBudget = 0; + for (ProcurementContentVO procurementContentVO : procurementContentVOList) { ReagentConsumables byId = reagentConsumablesService.getById(procurementContentVO.getReagentConsumableId()); - if (byId.getCategory().equals("试剂")|byId.getCategory().equals("耗材")){ + if (byId.getCategory().equals("试剂") | byId.getCategory().equals("耗材")) { + + appropriationBudget = appropriationBudget + procurementContentVO.getSubtotal(); voList.add(procurementContentVO); } @@ -406,7 +410,7 @@ public class PurchasingPlanController { //----------------------------- // 生成 word 版本的 采购目录 - String applyFileName = "采购计划-"+id; + String applyFileName = "采购计划-" + id; ByteArrayOutputStream bos = new ByteArrayOutputStream(); ossFile.fileGet("template" + "/" + "试剂耗材采购计划表模板.docx", bos); @@ -420,21 +424,24 @@ public class PurchasingPlanController { Configure config = Configure.builder(). bind("voList", policy).build(); + + Calendar instance = Calendar.getInstance(); + int year = instance.get(Calendar.YEAR); /** * 循环表格 */ + double finalAppropriationBudget = appropriationBudget; XWPFTemplate template = XWPFTemplate.compile(bis, config).render( new HashMap() {{ put("voList", voList); - put("appropriationBudget",purchasingPlanVO.getAppropriationBudget()); - put("id",id); - put("size",1); + put("appropriationBudget", finalAppropriationBudget); + put("year", year); put("createName", purchasingPlanVO.getCreateName()); put("primaryAuditorName", purchasingPlanVO.getPrimaryAuditorName()); put("approverName", purchasingPlanVO.getApproverName()); - put("createTime",LocalDateTimeUtil.format(purchasingPlanVO.getCommitTime(),"yyyy年MM月dd日")); - put("auditTimeOfPrimary",LocalDateTimeUtil.format(purchasingPlanVO.getAuditTimeOfPrimary(),"yyyy年MM月dd日")); - put("approvalTime",LocalDateTimeUtil.format(purchasingPlanVO.getApprovalTime(),"yyyy年MM月dd日")); + put("createTime", LocalDateTimeUtil.format(purchasingPlanVO.getCommitTime(), "yyyy年MM月dd日")); + put("auditTimeOfPrimary", LocalDateTimeUtil.format(purchasingPlanVO.getAuditTimeOfPrimary(), "yyyy年MM月dd日")); + put("approvalTime", LocalDateTimeUtil.format(purchasingPlanVO.getApprovalTime(), "yyyy年MM月dd日")); }} ); bis.close(); @@ -452,21 +459,17 @@ public class PurchasingPlanController { Response response = remoteWord2PDFService.word2pdf(mockMultipartFile); fisWord.close(); - ByteArrayOutputStream outPDF = new ByteArrayOutputStream(); IoUtil.copy(response.body().asInputStream(), outPDF, IoUtil.DEFAULT_MIDDLE_BUFFER_SIZE); ByteArrayInputStream isPDF = new ByteArrayInputStream(outPDF.toByteArray()); outPDF.close(); - ossFile.fileSave("document" + "/" + "purchasingPlan" + "/" + id + "/" + applyFileName + ".pdf", isPDF); isPDF.close(); - System.out.println(String.format("转换为 PDF 结束")); } - } 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 05d20c9..8554a66 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java @@ -326,10 +326,7 @@ public class ReagentConsumableInventoryController { return R.failed("未能查询到该标准物质的详细信息"); } } - ReagentConsumableInventoryFullVO byCode = reagentConsumableInventoryService.getByCode(id); - - return R.ok(byCode); } diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java b/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java index eba7917..a88a604 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java @@ -67,7 +67,7 @@ public class StandardMaterialApprovalFormController { */ @ApiOperation(value = "通过id查询", notes = "通过id查询") @GetMapping() - @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_get')" ) + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_get')") public R getById(String id, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); @@ -86,7 +86,7 @@ public class StandardMaterialApprovalFormController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_page')" ) + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_page')") public R> getStandardMaterialApprovalFormPage(Page page, String referenceMaterialName, @JsonFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") LocalDate endTime, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); @@ -96,6 +96,7 @@ public class StandardMaterialApprovalFormController { .like(StrUtil.isNotBlank(referenceMaterialName), "reference_material_name", referenceMaterialName) .ge(startTime != null, "create_time", startTime) .le(endTime != null, "create_time", endTime) + .orderByDesc("create_time") ); return R.ok(standardMaterialApprovalFormSList); @@ -112,7 +113,7 @@ public class StandardMaterialApprovalFormController { @ApiOperation(value = "新增(标准物质停用/报废销毁/恢复/降级使用审批表)", notes = "新增(标准物质停用/报废销毁/恢复/降级使用审批表)") @SysLog("新增(标准物质停用/报废销毁/恢复/降级使用审批表)") @PostMapping - @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_add')" ) + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_add')") public R postAddObject(@RequestBody StandardMaterialApprovalFormDTO standardMaterialApprovalFormDTO, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); @@ -127,7 +128,6 @@ public class StandardMaterialApprovalFormController { } - /** * 审核(标准物质停用/报废销毁/恢复/降级使用审批表) * @@ -177,25 +177,25 @@ public class StandardMaterialApprovalFormController { @ApiOperation(value = "标准物质停用", notes = "标准物质停用") @SysLog("标准物质停用") @PostMapping("/deactivate") - @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_deactivate')" ) + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_deactivate')") public R editById(String id, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); ReferenceMaterial byId = referenceMaterialService.getById(id); - if (byId.getStatus()==-3){ + if (byId.getStatus() == -3) { throw new RuntimeException(String.format("该标准物质已被领用，请先归还后再停用")); } byId.setStatus(-1); - if (referenceMaterialService.updateById(byId)) { - return R.ok("停用成功"); - } else { - return R.failed("停用失败"); - } + if (referenceMaterialService.updateById(byId)) { + return R.ok("停用成功"); + } else { + return R.failed("停用失败"); } + } /**-------标准物质停用报废销毁恢复降级使用审批表打印*/ /** @@ -207,7 +207,7 @@ public class StandardMaterialApprovalFormController { @ApiOperation(value = "标准物质停用报废销毁恢复降级使用审批表打印", notes = "标准物质停用报废销毁恢复降级使用审批表打印") @SysLog("标准物质停用报废销毁恢复降级使用审批表打印") @PostMapping("/print") - @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_print')") + @PreAuthorize("@pms.hasPermission('reagent_standard_material_approval_form_print')") public void bizGetPDFInventory(String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) { System.out.println("bizApplyWord................."); Principal principal = theHttpServletRequest.getUserPrincipal(); diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/WarehousingRecordFormController.java b/src/main/java/digital/laboratory/platform/reagent/controller/WarehousingRecordFormController.java index 68a4c0f..8addf73 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/WarehousingRecordFormController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/WarehousingRecordFormController.java @@ -95,7 +95,8 @@ public class WarehousingRecordFormController { IPage warehousingRecordFormVOList = warehousingRecordFormService.getWarehousingRecordFormVOPage(page, Wrappers.query() .ge(startTime != null, "create_time", startTime) .eq(StrUtil.isNotBlank(status), "status", status) - .le(endTime != null, "create_time", endTime)); + .le(endTime != null, "create_time", endTime) + .orderByDesc("create_time")); return R.ok(warehousingRecordFormVOList); @@ -137,7 +138,7 @@ public class WarehousingRecordFormController { @SysLog("新增签收记录表") @PostMapping // @PreAuthorize("@pms.hasPermission('reagent_warehousing_record_form_add')") - public R postAddObject(@RequestBody WarehousingRecordFormDTO warehousingRecordFormDTO, HttpServletRequest theHttpServletRequest) { + public R postAddObject(@RequestBody WarehousingRecordFormDTO warehousingRecordFormDTO, HttpServletRequest theHttpServletRequest) { Principal principal = theHttpServletRequest.getUserPrincipal(); diff --git a/src/main/java/digital/laboratory/platform/reagent/dto/AcceptanceRecordFormAuditDTO.java b/src/main/java/digital/laboratory/platform/reagent/dto/AcceptanceRecordFormAuditDTO.java new file mode 100644 index 0000000..4d8c145 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/dto/AcceptanceRecordFormAuditDTO.java @@ -0,0 +1,14 @@ +package digital.laboratory.platform.reagent.dto; + +import lombok.Data; + +import java.util.List; +@Data +public class AcceptanceRecordFormAuditDTO { + + private List uuId; + + private Boolean auditResult; + + private String auditOpinion; +} diff --git a/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java index ff711d5..b292e56 100644 --- a/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java +++ b/src/main/java/digital/laboratory/platform/reagent/dto/ApplicationForUseBatchDTO.java @@ -8,5 +8,5 @@ public class ApplicationForUseBatchDTO { List applicationForUseDTOList; - String templateId; + String experimentId; } diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java b/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java index bbbffa3..2cec9d0 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceRecordForm.java @@ -206,7 +206,7 @@ public class AcceptanceRecordForm extends BaseEntity { /** * (状态) */ - @ApiModelProperty(value = "状态(0：未提交，1：已提交，2：一级审核通过，3：二级审核通过，4：三级审核通过)") + @ApiModelProperty(value = "状态(0：未提交，1：一级待审核，2：二级待审核，3：三级待审核，6：审核通过，-2 一级审核不不通过，-3：二级审核不通过，-4 三级审核不通过)") private Integer status; /** * (签收物品明细Id) diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java b/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java new file mode 100644 index 0000000..52f6d02 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/entity/AcceptanceSignFor.java @@ -0,0 +1,32 @@ +package digital.laboratory.platform.reagent.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import digital.laboratory.platform.common.mybatis.base.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@TableName(value = "acceptance_sign_for", autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "(验收中间表)") +public class AcceptanceSignFor extends BaseEntity { + + @TableId(value = "id", type = IdType.ASSIGN_UUID) + @ApiModelProperty(value = "ID") + private String id; + + + @ApiModelProperty(value = "验收种数") + private Integer quantity; + + + @ApiModelProperty(value = "签收记录表ID") + private String warehousingRecordFormId; + + @ApiModelProperty(value = "状态 0 未开始签收 1 进行中 2 已完成 ") + private Integer status; +} diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/CentralizedRequest.java b/src/main/java/digital/laboratory/platform/reagent/entity/CentralizedRequest.java index da5b765..ffee270 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/CentralizedRequest.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/CentralizedRequest.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import digital.laboratory.platform.common.mybatis.base.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,42 +29,42 @@ public class CentralizedRequest extends BaseEntity { /** * (编号) */ - @ApiModelProperty(value="编号") + @ApiModelProperty(value = "编号") private String number; /** * (申请人ID) */ - @ApiModelProperty(value="申请人ID") + @ApiModelProperty(value = "申请人ID") private String applicantId; /** * (申请日期) */ - @ApiModelProperty(value="申请日期") + @ApiModelProperty(value = "申请日期") private LocalDateTime dateOfApplication; /** * 采购计划ID */ - @ApiModelProperty(value="采购计划ID") + @ApiModelProperty(value = "采购计划ID") private String purchasingPlanId; /** * (状态) */ - @ApiModelProperty(value="状态(0:未提交，1：已提交，2:已审核 3：已被制定采购计划 ,4:已被制定采购清单)") + @ApiModelProperty(value = "状态(0:未提交，1：待审核，6:审核通过 3：已被制定采购计划 ,4:已被制定采购清单，-2审核不通过)") private Integer status; -/** + /** * (申请人名称) */ - @ApiModelProperty(value="申请人名称") - private String applicantName; + @ApiModelProperty(value = "申请人名称") + private String applicantName; private boolean auditResult; - private String auditOpinion; + private String auditOpinion; private String auditId; @@ -72,7 +74,7 @@ public class CentralizedRequest extends BaseEntity { * centralizedRequestId */ @TableId(value = "id", type = IdType.ASSIGN_UUID) - @ApiModelProperty(value="集中采购申请ID") + @ApiModelProperty(value = "集中采购申请ID") private String id; diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java b/src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java index 8d22e84..549ef85 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/ComplianceCheck.java @@ -98,7 +98,7 @@ public class ComplianceCheck extends BaseEntity { /** * (状态) */ - @ApiModelProperty(value = "状态(-1:计划创建，0：已录入方案，1：已提交，2：一级审核通过，3：二级审核通过，-2：审核不通过)") + @ApiModelProperty(value = "状态(-1:计划创建，0：已录入方案，1：一级待审核，2：二级待审核，6：审核通过，-2：一级审核不通过，-3二级审核不通过)") private Integer status; /** diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/DecentralizeDetails.java b/src/main/java/digital/laboratory/platform/reagent/entity/DecentralizeDetails.java index 2518d47..69f05ea 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/DecentralizeDetails.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/DecentralizeDetails.java @@ -23,7 +23,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "分散采购申请明细") public class DecentralizeDetails extends BaseEntity { - /** * (品牌) */ @@ -167,7 +166,10 @@ public class DecentralizeDetails extends BaseEntity { @ApiModelProperty(value = "CAS-号") private String casNumber; + @ApiModelProperty(value = "物品编码") private String code; + + } diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumablesSet.java b/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumablesSet.java index 63a512c..8974b78 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumablesSet.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumablesSet.java @@ -26,7 +26,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @ApiModel(value = "(试剂耗材集合)") public class ReagentConsumablesSet extends BaseEntity { - /** * (试剂耗材领用申请表ID) */ @@ -77,7 +76,7 @@ public class ReagentConsumablesSet extends BaseEntity { */ @ApiModelProperty(value = "(批次)") private String batchDetailsId; - + /** * reagentConsumablesSetId */ diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/RequisitionRecord.java b/src/main/java/digital/laboratory/platform/reagent/entity/RequisitionRecord.java index f4018eb..40e27fa 100644 --- a/src/main/java/digital/laboratory/platform/reagent/entity/RequisitionRecord.java +++ b/src/main/java/digital/laboratory/platform/reagent/entity/RequisitionRecord.java @@ -66,7 +66,7 @@ public class RequisitionRecord extends BaseEntity { @ApiModelProperty(value="编号") private String number; - private String id; + private String deliveryRegistrationFormId; private String reagentConsumableName; diff --git a/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceRecordFormMapper.java b/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceRecordFormMapper.java index ef23b8c..3ba305e 100644 --- a/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceRecordFormMapper.java +++ b/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceRecordFormMapper.java @@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface AcceptanceRecordFormMapper extends BaseMapper { - IPage getAcceptanceRecordFormVOPage(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw,String acceptanceSignForId); + IPage getAcceptanceRecordFormVOPage(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); AcceptanceRecordFormVO getAcceptanceRecordFormVO(String acceptanceRecordFormId); } diff --git a/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceSignForMapper.java b/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceSignForMapper.java new file mode 100644 index 0000000..ffcc968 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/mapper/AcceptanceSignForMapper.java @@ -0,0 +1,11 @@ +package digital.laboratory.platform.reagent.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import digital.laboratory.platform.reagent.entity.AcceptanceSignFor; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AcceptanceSignForMapper extends BaseMapper { + + +} diff --git a/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceRecordFormService.java b/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceRecordFormService.java index 326c331..6ce047d 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceRecordFormService.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceRecordFormService.java @@ -30,7 +30,7 @@ public interface AcceptanceRecordFormService extends IService getAcceptanceRecordFormVOPage(IPage page, QueryWrapperqw,String acceptanceSignForId); + IPage getAcceptanceRecordFormVOPage(IPage page, QueryWrapperqw); IPage getAcceptanceRecordFormVORecordPage(IPage page); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceSignForService.java b/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceSignForService.java new file mode 100644 index 0000000..1eaeb7c --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/service/AcceptanceSignForService.java @@ -0,0 +1,7 @@ +package digital.laboratory.platform.reagent.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import digital.laboratory.platform.reagent.entity.AcceptanceSignFor; + +public interface AcceptanceSignForService extends IService { +} diff --git a/src/main/java/digital/laboratory/platform/reagent/service/DecentralizedRequestService.java b/src/main/java/digital/laboratory/platform/reagent/service/DecentralizedRequestService.java index 1840be6..ac2473a 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/DecentralizedRequestService.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/DecentralizedRequestService.java @@ -12,6 +12,8 @@ import digital.laboratory.platform.reagent.entity.DecentralizedRequest; import digital.laboratory.platform.reagent.vo.DecentralizedRequestVO; import org.apache.ibatis.annotations.Param; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -46,4 +48,6 @@ public interface DecentralizedRequestService extends IService getAcceptanceRecordFormVOPage(IPage page, QueryWrapper qw,String acceptanceSignForId) { + public IPage getAcceptanceRecordFormVOPage(IPage page, QueryWrapper qw) { - IPage acceptanceRecordFormVOPage = baseMapper.getAcceptanceRecordFormVOPage(page, qw,acceptanceSignForId); + IPage acceptanceRecordFormVOPage = baseMapper.getAcceptanceRecordFormVOPage(page, qw); List records = acceptanceRecordFormVOPage.getRecords(); @@ -317,13 +319,24 @@ public class AcceptanceRecordFormServiceImpl extends ServiceImpl uuId = acceptanceRecordFormAuditDTO.getUuId(); List acceptanceRecordForms = new ArrayList<>(); + List stringList = new ArrayList<>(); + + for (String s : uuId) { + AcceptanceRecordForm byId = this.getById(s); + if (!stringList.contains(byId.getAcceptanceSignForId())) { + + stringList.add(byId.getAcceptanceSignForId()); + + } + if (byId.getStatus() != 3) { throw new RuntimeException(String.format("当前状态不能审核")); } @@ -341,8 +354,46 @@ public class AcceptanceRecordFormServiceImpl extends ServiceImpl warehousing_record_form_id = warehousingContentService.list(Wrappers.query().eq("warehousing_record_form_id", warehousingRecordFormService.getById(acceptanceSignFor.getWarehousingRecordFormId()).getId())); + + List recordFormList = this.list(Wrappers.query().eq("acceptance_sign_for_id", s)); + + if (warehousing_record_form_id.size() == recordFormList.size()) { + + int x = 0; + + for (AcceptanceRecordForm acceptanceRecordForm : recordFormList) { + + if (acceptanceRecordForm.getStatus() == 6) { + + x = x + 1; + + } + } + if (x == recordFormList.size()) { + + AcceptanceSignFor byId = acceptanceSignForService.getById(s); + + byId.setStatus(2); + + acceptanceSignForService.updateById(byId); + } + } + } return true; } else throw new RuntimeException(String.format("审核失败")); } @@ -409,6 +460,9 @@ public class AcceptanceRecordFormServiceImpl extends ServiceImpl implements AcceptanceSignForService { +} 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 a692c64..1fa50f8 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 @@ -251,7 +251,7 @@ public class ApplicationForUseServiceImpl extends ServiceImpl reagentConsumablesSets = new ArrayList<>(); @@ -273,7 +273,9 @@ public class ApplicationForUseServiceImpl extends ServiceImpl reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>(); - reagentConsumableInventoryLambdaQueryWrapper.eq(ReagentConsumableInventory::getReagentConsumableId, applicationForUseDTO.getReagentConsumableId()); + ReferenceMaterial referenceMaterial = referenceMaterialService.getById(applicationForUseDTO.getReferenceMaterialId()); + + reagentConsumableInventoryLambdaQueryWrapper.eq(ReagentConsumableInventory::getReagentConsumableId, referenceMaterial.getReagentConsumableId()); ReagentConsumableInventory one = reagentConsumableInventoryService.getOne(reagentConsumableInventoryLambdaQueryWrapper); @@ -308,7 +310,6 @@ public class ApplicationForUseServiceImpl extends ServiceImpl list = reagentConsumablesSetService.getList(applicationForUse.getId()); reagentConsumablesSetList.addAll(list); - } return reagentConsumablesSetList; } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/CategoryTableServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/CategoryTableServiceImpl.java index 4a091f9..f035538 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/CategoryTableServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/CategoryTableServiceImpl.java @@ -21,8 +21,6 @@ import java.util.List; @Service @SuppressWarnings("all") public class CategoryTableServiceImpl extends ServiceImpl implements CategoryTableService { - - @Override public CategoryTable addSpecies(String category, String species) { @@ -51,7 +49,6 @@ public class CategoryTableServiceImpl extends ServiceImpl detailsOfCentralizedVOList = centralizedRequest.getDetailsOfCentralizedVOList(); @@ -314,6 +320,10 @@ public class CentralizedRequestServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("id", id); - put("size", 1); + put("year", year); put("total", finalTotal); put("finalFirstAuditName", finalFirstAuditName); put("finalSecondAuditName", finalSecondAuditName); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/CheckScheduleServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/CheckScheduleServiceImpl.java index 92c7a8d..a120697 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/CheckScheduleServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/CheckScheduleServiceImpl.java @@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -262,14 +263,15 @@ public class CheckScheduleServiceImpl extends ServiceImpl() {{ put("voList",voList); - put("id",id); - put("size",1); + put("year",year); put("managerName",checkScheduleVO.getManagerName()); put("technicalDirectorName",checkScheduleVO.getTechnicalDirectorName()); put("auditTimeOfTechnical", LocalDateTimeUtil.format(checkScheduleVO.getAuditTimeOfTechnical(),"yyyy年MM月dd日")); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/DecentralizedRequestServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/DecentralizedRequestServiceImpl.java index ceb58ff..980d901 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/DecentralizedRequestServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/DecentralizedRequestServiceImpl.java @@ -1,26 +1,42 @@ package digital.laboratory.platform.reagent.service.impl; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.io.IoUtil; 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.Constants; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.config.ConfigureBuilder; +import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy; +import digital.laboratory.platform.common.feign.RemoteWord2PDFService; import digital.laboratory.platform.common.mybatis.security.service.DLPUser; +import digital.laboratory.platform.common.oss.service.OssFile; import digital.laboratory.platform.reagent.dto.*; import digital.laboratory.platform.reagent.entity.*; import digital.laboratory.platform.reagent.mapper.DecentralizedRequestMapper; import digital.laboratory.platform.reagent.service.*; import digital.laboratory.platform.reagent.vo.DecentralizedRequestVO; +import feign.Response; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; import java.util.List; /** @@ -46,6 +62,11 @@ public class DecentralizedRequestServiceImpl extends ServiceImpl getDecentralizedRequestVOPage @@ -287,30 +308,30 @@ public class DecentralizedRequestServiceImpl extends ServiceImpl decentralizeDetailsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + //如果未购入过该物品，则将该物品信息更新至试剂耗材类 + LambdaQueryWrapper decentralizeDetailsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - decentralizeDetailsLambdaQueryWrapper.eq(DecentralizeDetails::getDecentralizedRequestId, byId.getId()); + decentralizeDetailsLambdaQueryWrapper.eq(DecentralizeDetails::getDecentralizedRequestId, byId.getId()); - List decentralizeDetailsList = decentralizeDetailsService.list(decentralizeDetailsLambdaQueryWrapper); + List decentralizeDetailsList = decentralizeDetailsService.list(decentralizeDetailsLambdaQueryWrapper); - LambdaQueryWrapper reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>(); - for (DecentralizeDetails decentralizeDetails : decentralizeDetailsList) { + for (DecentralizeDetails decentralizeDetails : decentralizeDetailsList) { - if (decentralizeDetails.getReagentConsumableId() == null) { + if (decentralizeDetails.getReagentConsumableId() == null) { - ReagentConsumables reagentConsumables = reagentConsumablesService.addReagentConsumables(decentralizeDetails); + ReagentConsumables reagentConsumables = reagentConsumablesService.addReagentConsumables(decentralizeDetails); - decentralizeDetails.setReagentConsumableId(reagentConsumables.getReagentConsumableId()); + decentralizeDetails.setReagentConsumableId(reagentConsumables.getReagentConsumableId()); - decentralizeDetailsService.updateById(decentralizeDetails); - } else { - ReagentConsumables byId1 = reagentConsumablesService.getById(decentralizeDetails.getReagentConsumableId()); - byId1.setTechnicalParameter(decentralizeDetails.getTechnicalParameter()); - reagentConsumablesService.updateById(byId1); - } + decentralizeDetailsService.updateById(decentralizeDetails); + } else { + ReagentConsumables byId1 = reagentConsumablesService.getById(decentralizeDetails.getReagentConsumableId()); + byId1.setTechnicalParameter(decentralizeDetails.getTechnicalParameter()); + reagentConsumablesService.updateById(byId1); } + } //创建采购清单 LambdaQueryWrapper decentralizeDetailsLambdaQueryWrapper1 = new LambdaQueryWrapper<>(); @@ -320,10 +341,11 @@ public class DecentralizedRequestServiceImpl extends ServiceImpl list = decentralizeDetailsService.list(decentralizeDetailsLambdaQueryWrapper1); PurchaseList purchaseList = new PurchaseList(); - purchaseList.setId(byId.getCreateBy()); purchaseList.setName(DateTime.now() + "采购清单"); purchaseList.setStatus(0); + purchaseList.setCreateBy(byId.getCreateBy()); purchaseList.setType("分散采购申请"); + purchaseList.setId(IdWorker.get32UUID().toUpperCase()); byId.setPurchaseListId(purchaseList.getId()); this.updateById(byId); @@ -354,6 +376,126 @@ public class DecentralizedRequestServiceImpl extends ServiceImpl decentralizeDetailsList = requestById.getDecentralizeDetailsVOList(); + + if (decentralizeDetailsList == null) { + + throw new RuntimeException(String.format("未查询到相关信息")); + } + + List voList = new ArrayList<>(); + + for (DecentralizeDetails decentralizeDetails : decentralizeDetailsList) { + + if (!decentralizeDetails.getCategory().equals("标准物质")) { + voList.add(decentralizeDetails); + } + } + + firstAuditName = requestById.getPrimaryAuditorName(); + secondAuditName = requestById.getSecondaryAuditorName(); + thirdAuditName = requestById.getThreeLevelAuditName(); + fourthAuditName = requestById.getApproverName(); + commitTime = LocalDateTimeUtil.format(requestById.getCommitTime(), "yyyy年MM月dd日"); + + + String applyFileName = "试剂耗材分散采购申请表-" + id; + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ossFile.fileGet("template" + "/" + "试剂耗材分散采购申请表.docx", bos); + + byte[] templateArray = bos.toByteArray(); + + ByteArrayInputStream bis = new ByteArrayInputStream(templateArray); + bos.close(); + + LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy(); + + ConfigureBuilder builder = Configure.builder().buildGramer("${", "}").useSpringEL(false); + builder.bind("voList", policy). + + build(); + + /** + * 循环表格 + */ + double finalTotal = total; + String finalFourthAuditName = fourthAuditName; + String finalSecondAuditName = secondAuditName; + String finalThirdAuditName = thirdAuditName; + String finalFirstAuditName = firstAuditName; + String finalCommitTime = commitTime; + Calendar instance = Calendar.getInstance(); + int year = instance.get(Calendar.YEAR); + XWPFTemplate template = XWPFTemplate.compile(bis, builder.build()).render( + + + new HashMap() {{ + put("voList", voList); + put("finalFirstAuditName", finalFirstAuditName); + put("finalSecondAuditName", finalSecondAuditName); + put("finalThirdAuditName", finalThirdAuditName); + put("finalFourthAuditName", finalFourthAuditName); + put("applicantName", requestById.getApplicantName()); + put("commitTme", LocalDateTimeUtil.format(requestById.getCommitTime(), "yyyy年MM月dd日")); + put("auditTimeOfPrimary", LocalDateTimeUtil.format(requestById.getAuditTimeOfPrimary(), "yyyy年MM月dd日")); + put("auditTimeOfSecondary", LocalDateTimeUtil.format(requestById.getAuditTimeOfSecondary(), "yyyy年MM月dd日")); + put("auditTimeOfThreeLeve", LocalDateTimeUtil.format(requestById.getAuditTimeOfThreeLevel(), "yyyy年MM月dd日")); + put("approvalOfTime", LocalDateTimeUtil.format(requestById.getApprovalOfTime(), "yyyy年MM月dd日")); + }} + ); + bis.close(); + + ByteArrayOutputStream fosWord = new ByteArrayOutputStream(); + template.write(fosWord); + template.close(); + + //------------ + ByteArrayInputStream fisWord = new ByteArrayInputStream(fosWord.toByteArray()); + fosWord.close(); + + //MockMultipartFile mockMultipartFile = new MockMultipartFile("file", entrustmentLetterFileName + ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", fisWord); + MockMultipartFile mockMultipartFile = new MockMultipartFile("file", applyFileName + ".docx", "image/jpg", fisWord); + Response response = remoteWord2PDFService.word2pdf(mockMultipartFile); + fisWord.close(); + + + ByteArrayOutputStream outPDF = new ByteArrayOutputStream(); + IoUtil.copy(response.body(). + + asInputStream(), outPDF, IoUtil.DEFAULT_MIDDLE_BUFFER_SIZE); + ByteArrayInputStream isPDF = new ByteArrayInputStream(outPDF.toByteArray()); + outPDF.close(); + + + ossFile.fileSave("document" + "/" + "DecentralizeRequest" + "/" + id + "/" + applyFileName + ".pdf", isPDF); + isPDF.close(); + + + System.out.println(String.format("转换为 PDF 结束")); + + } } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/DeliveryRegistrationFormServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/DeliveryRegistrationFormServiceImpl.java index 9f02ce9..102c6ac 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/DeliveryRegistrationFormServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/DeliveryRegistrationFormServiceImpl.java @@ -126,7 +126,7 @@ public class DeliveryRegistrationFormServiceImpl extends ServiceImpl outgoingContentsDTOS, DLPUser dlpUser) { + //得到出库登记表 DeliveryRegistrationForm byId = this.getById(outgoingContentsDTOS.get(0).getDeliveryRegistrationFormId()); @@ -403,7 +404,7 @@ public class DeliveryRegistrationFormServiceImpl extends ServiceImplquery() .eq("claim_code", claimCode)); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/PeriodVerificationImplementationServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/PeriodVerificationImplementationServiceImpl.java index fa43a85..50ed9ce 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/PeriodVerificationImplementationServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/PeriodVerificationImplementationServiceImpl.java @@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -220,15 +221,12 @@ public class PeriodVerificationImplementationServiceImpl extends ServiceImpl() {{ - put("id", id); - put("size", 1); + put("year", year); put("referenceMaterialName", periodVerificationImplementationVO.getReferenceMaterialName()); put("referenceMaterialNumber", periodVerificationImplementationVO.getReferenceMaterialNumber()); put("standardValueOrPurity", periodVerificationImplementationVO.getStandardValueOrPurity()); @@ -265,12 +264,11 @@ public class PeriodVerificationImplementationServiceImpl extends ServiceImplquery() .eq("reagent_consumable_id", byId.getReagentConsumableId())); - List batchDetailsList = batchDetailsService.list(Wrappers.query().eq("reagent_consumable_inventory_id", one.getReagentConsumableInventoryId()) - .orderByDesc("create_time")); - WarehousingContent warehousingContent = new WarehousingContent(); - if (batchDetailsList.size() != 0 && batchDetailsList != null) { - warehousingContent.setLastStorageLocation(batchDetailsList.get(0).getLocation()); - warehousingContent.setBoxId(batchDetailsList.get(0).getBoxId()); - warehousingContent.setLatticeId(batchDetailsList.get(0).getLatticeId()); - } //完善入库内容信息 warehousingContent.setId(IdWorker.get32UUID().toUpperCase()); @@ -216,7 +208,15 @@ public class PurchaseListServiceImpl extends ServiceImpl batchDetailsList = batchDetailsService.list(Wrappers.query().eq("reagent_consumable_inventory_id", one.getReagentConsumableInventoryId()) + .orderByDesc("create_time")); warehousingContent.setWarningValue(one.getWarningValue()); + if (batchDetailsList.size() != 0 && batchDetailsList != null) { + + warehousingContent.setLastStorageLocation(batchDetailsList.get(0).getLocation()); + warehousingContent.setBoxId(batchDetailsList.get(0).getBoxId()); + warehousingContent.setLatticeId(batchDetailsList.get(0).getLatticeId()); + } } LambdaQueryWrapper 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 0904f05..1c4effc 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 @@ -31,10 +31,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 试剂耗材库存服务实现类 @@ -528,14 +525,15 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("id", id); - put("size", 1); + put("year", year); }} ); bis.close(); @@ -623,7 +621,7 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl data = new HashMap<>(); - - String qrCodeImageBase64 = QRCodeUtils.getQRCodeImageBase64(standardReserveSolutionVOById.getSolutionName(), 12, 12); data.put("standardReserveSolution", standardReserveSolutionVOById); String templateFileName = "标准储备溶液标签模板.vm"; - return remoteTemplate2htmlService.getHtml(templateFileName, data); } diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumablesSetServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumablesSetServiceImpl.java index 70b16f4..e5777c2 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumablesSetServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumablesSetServiceImpl.java @@ -2,14 +2,12 @@ package digital.laboratory.platform.reagent.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import digital.laboratory.platform.reagent.entity.ApplicationForUse; import digital.laboratory.platform.reagent.entity.ReagentConsumableInventory; import digital.laboratory.platform.reagent.entity.ReagentConsumables; import digital.laboratory.platform.reagent.entity.ReagentConsumablesSet; import digital.laboratory.platform.reagent.mapper.ReagentConsumablesSetMapper; -import digital.laboratory.platform.reagent.service.ReagentConsumableInventoryService; -import digital.laboratory.platform.reagent.service.ReagentConsumablesService; -import digital.laboratory.platform.reagent.service.ReagentConsumablesSetService; -import digital.laboratory.platform.reagent.service.ReferenceMaterialService; +import digital.laboratory.platform.reagent.service.*; import digital.laboratory.platform.reagent.vo.ReagentConsumablesSetVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,9 +35,14 @@ public class ReagentConsumablesSetServiceImpl extends ServiceImpl getList(String applicationForUseId) { + ApplicationForUse applicationForUse = applicationForUseService.getById(applicationForUseId); + LambdaQueryWrapper reagentConsumablesSetLambdaQueryWrapper = new LambdaQueryWrapper<>(); reagentConsumablesSetLambdaQueryWrapper.eq(ReagentConsumablesSet::getApplicationForUseId, applicationForUseId); @@ -68,14 +71,18 @@ public class ReagentConsumablesSetServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("id",id); - put("size",1); - + put("year",year); }} ); bis.close(); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReviewAndApproveServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReviewAndApproveServiceImpl.java index c036d3f..d952663 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReviewAndApproveServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReviewAndApproveServiceImpl.java @@ -652,27 +652,7 @@ public class ReviewAndApproveServiceImpl extends ServiceImpl purchaseCatalogueLambdaQueryWrapper = new LambdaQueryWrapper<>(); - - purchaseCatalogueLambdaQueryWrapper.eq(PurchaseCatalogue::getAuditorId, dlpUser.getId()); - - List list = purchaseCatalogueService.list(purchaseCatalogueLambdaQueryWrapper); - - ArrayList purchaseCatalogueVOArrayList = new ArrayList<>(); - for (PurchaseCatalogue purchaseCatalogue : list) { - - PurchaseCatalogueVO purchaseCatalogueVO = purchaseCatalogueService.getPurchaseCatalogueVO(purchaseCatalogue.getPurchaseCatalogueId()); - - purchaseCatalogueVOArrayList.add(purchaseCatalogueVO); - - } - purchaseCatalogueVOList.addAll(purchaseCatalogueVOArrayList); - - } //采购计划已审核列表 if (permissions.contains("reagent_purchasing_plan_audit")) { diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java index 32e2930..2897b91 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApplicationServiceImpl.java @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.time.LocalDateTime; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -234,14 +235,15 @@ public class StandardMaterialApplicationServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("ids", ids); - put("size", 1); + put("year", year); }} ); bis.close(); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java index e4c95c3..c758356 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java @@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.time.LocalDateTime; +import java.util.Calendar; import java.util.HashMap; /** @@ -236,13 +237,14 @@ public class StandardMaterialApprovalFormServiceImpl extends ServiceImpl() {{ - put("id", id); - put("size", 1); + put("year", year); put("referenceMaterialName",standardMaterialApprovalFormVO.getReferenceMaterialName()); put("referenceMaterialNumber",standardMaterialApprovalFormVO.getReferenceMaterialNumber()); put("batchNumber",standardMaterialApprovalFormVO.getBatchNumber()); 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 d5ef60b..f6c3624 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 @@ -85,6 +85,8 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl solutionUseFormVOList = solutionUseFormService.getSolutionUseFormVOList(standardReserveSolutionVOById.getId()); @@ -121,7 +123,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl reagentConsumableInventoryLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -160,14 +162,10 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl list = referenceMaterialService.list(Wrappers.query() .likeRight("number", prefix) @@ -191,7 +189,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl list = referenceMaterialService.list(Wrappers.query() .likeRight("number", prefix) @@ -258,7 +256,7 @@ public class StandardReserveSolutionServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("id", id); - put("size", 1); + put("year", year); put("solutionName", standardReserveSolutionVO.getSolutionName()); put("solutionNumbering", standardReserveSolutionVO.getSolutionNumbering()); put("referenceMaterialNumber", standardReserveSolutionVO.getReferenceMaterialNumber()); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardSolutionCurveServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardSolutionCurveServiceImpl.java index b676d18..6b51378 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardSolutionCurveServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardSolutionCurveServiceImpl.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.time.LocalDateTime; +import java.util.Calendar; import java.util.HashMap; import java.util.List; @@ -145,13 +146,15 @@ public class StandardSolutionCurveServiceImpl extends ServiceImpl() {{ put("voList", voList); - put("id", id); + put("year", year); put("size", 1); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java index 1163b7a..bd141f5 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/SupplierInformationServiceImpl.java @@ -39,20 +39,13 @@ public class SupplierInformationServiceImpl extends ServiceImpl supplierInformationQueryWrapper = new LambdaQueryWrapper(); - - List list = this.list(supplierInformationQueryWrapper); + SupplierInformation one = this.getOne(Wrappers.query().eq("supplier_name", supplierInformationDTO.getSupplierName())); - if (list.size() != 0) { + if (one != null) { - for (SupplierInformation information : list) { - if (information.getSupplierName().equals(supplierInformationDTO.getSupplierName())) { - throw new RuntimeException(String.format("该供应商信息已存在")); - } - } + throw new RuntimeException(String.format("该供应商信息已存在")); } + SupplierInformation supplierInformation = new SupplierInformation(); BeanUtils.copyProperties(supplierInformationDTO, supplierInformation); @@ -67,12 +60,6 @@ public class SupplierInformationServiceImpl extends ServiceImplquery().eq("supplier_name", supplierInformationDTO.getSupplierName())); - - if (supplier_name != null) { - throw new RuntimeException(String.format("该供应商信息已存在")); - } - SupplierInformation byId = this.getById(supplierInformationDTO.getId()); BeanUtils.copyProperties(supplierInformationDTO, byId); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java index f9699ad..7c609a3 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/WarehousingRecordFormServiceImpl.java @@ -293,6 +293,7 @@ public class WarehousingRecordFormServiceImpl extends ServiceImpl reagentConsumablesLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -412,6 +413,7 @@ public class WarehousingRecordFormServiceImpl extends ServiceImpl size) { + if (pageSize > size) { pageSize = size; } - if (pageSize!=0){ + if (pageSize != 0) { // 求出最大页数，防止currentPage越界 - int maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; + long maxPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; - if(currentPage > maxPage) { + if (currentPage > maxPage) { currentPage = maxPage; } } // 当前页第一条数据的下标 - int curIdx = currentPage > 1 ? (currentPage - 1) * pageSize : 0; + long x = currentPage > 1 ? (currentPage - 1) * pageSize : 0; + + int curIdx = (int) x; List pageList = new ArrayList(); // 将当前页的数据放进pageList - for(int i = 0; i < pageSize && curIdx + i < size; i++) { + for (int i = 0; i < pageSize && curIdx + i < size; i++) { pageList.add(list.get(curIdx + i)); } diff --git a/src/main/java/digital/laboratory/platform/reagent/vo/AcceptanceRecordFormFullVO.java b/src/main/java/digital/laboratory/platform/reagent/vo/AcceptanceRecordFormFullVO.java new file mode 100644 index 0000000..371aaf8 --- /dev/null +++ b/src/main/java/digital/laboratory/platform/reagent/vo/AcceptanceRecordFormFullVO.java @@ -0,0 +1,14 @@ +package digital.laboratory.platform.reagent.vo; + +import java.time.LocalDateTime; +import java.util.List; + +public class AcceptanceRecordFormFullVO { + + private String type = "验收任务"; + + private LocalDateTime localDateTime; + + List acceptanceRecordFormVOList; + +} diff --git a/src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumablesSetVO.java b/src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumablesSetVO.java index e864269..a3c9eb9 100644 --- a/src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumablesSetVO.java +++ b/src/main/java/digital/laboratory/platform/reagent/vo/ReagentConsumablesSetVO.java @@ -17,4 +17,5 @@ public class ReagentConsumablesSetVO extends ReagentConsumablesSet { public Integer totalQuantity; + public String claimCode; } diff --git a/src/main/java/digital/laboratory/platform/reagent/vo/ReferenceMaterialVO.java b/src/main/java/digital/laboratory/platform/reagent/vo/ReferenceMaterialVO.java index 4b8900d..7377d3a 100644 --- a/src/main/java/digital/laboratory/platform/reagent/vo/ReferenceMaterialVO.java +++ b/src/main/java/digital/laboratory/platform/reagent/vo/ReferenceMaterialVO.java @@ -25,5 +25,5 @@ public class ReferenceMaterialVO extends ReferenceMaterial { private String codeName; - private LocalDate time; + private String time; } diff --git a/src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java b/src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java index 4facd71..8bc3404 100644 --- a/src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java +++ b/src/main/java/digital/laboratory/platform/reagent/vo/StandardReserveSolutionVO.java @@ -4,6 +4,7 @@ import digital.laboratory.platform.reagent.entity.StandardReserveSolution; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data public class StandardReserveSolutionVO extends StandardReserveSolution { @@ -20,4 +21,7 @@ public class StandardReserveSolutionVO extends StandardReserveSolution { private Integer storageLife; private String latticeId; + + @ApiModelProperty(value = "配置日期打印") + private String configurationDatePrint; } diff --git a/src/main/resources/mapper/AcceptanceRecordFormMapper.xml b/src/main/resources/mapper/AcceptanceRecordFormMapper.xml index 058295a..a83c3f7 100644 --- a/src/main/resources/mapper/AcceptanceRecordFormMapper.xml +++ b/src/main/resources/mapper/AcceptanceRecordFormMapper.xml @@ -81,7 +81,6 @@ WHERE user.user_id=arf.three_level_auditor_id ) AS three_level_auditor_name FROM acceptance_record_form arf - WHERE arf.acceptance_sign_for_id = #{acceptanceSignForId} +