Merge remote-tracking branch 'origin/main'

# Conflicts: # .idea/workspace.xml
2023-04-14 10:09:47 +08:00
parent 4811468e75 1eca870234
commit b498a5fb37
388 changed files with 1 additions and 6486 deletions
@@ -34,3 +34,4 @@ target/
 /.idea/
 /.gitignore
 /logs/
+/target/
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="dlp-utilities" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="dlp-utilities" options="-Xlint:unchecked" />
-    </option>
-  </component>
-</project>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-222.3739.54">
-    <data-source name="@localhost" uuid="abe8a707-1f9a-41a4-8028-b8f36936e974">
-      <database-info product="MySQL" version="5.7.31-log" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="5.7.31" exact-driver-version="8.0">
-        <extra-name-characters>#@</extra-name-characters>
-        <identifier-quote-string>`</identifier-quote-string>
-      </database-info>
-      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
-      <secret-storage>master_key</secret-storage>
-      <user-name>root</user-name>
-      <schema-mapping>
-        <introspection-scope>
-          <node kind="schema" qname="reagent_managment" />
-        </introspection-scope>
-      </schema-mapping>
-    </data-source>
-  </component>
-</project>
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="@localhost" uuid="abe8a707-1f9a-41a4-8028-b8f36936e974">
-      <driver-ref>mysql.8</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>
@@ -1,2 +0,0 @@
-#n:information_schema
-!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -1,2 +0,0 @@
-#n:mysql
-!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -1,2 +0,0 @@
-#n:performance_schema
-!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -1,2 +0,0 @@
-#n:sys
-!<md> [null, 0, null, null, -2147483648, -2147483648]
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK" />
-</project>
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="84c9e5ca-eb2c-413b-a858-1d19b01d5e5b" name="变更" comment="4.13">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/controller/StandardMaterialApprovalFormController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/entity/StandardMaterialApprovalForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/entity/StandardMaterialApprovalForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/mapper/StandardMaterialApprovalFormMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/mapper/StandardMaterialApprovalFormMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/StandardMaterialApprovalFormService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/StandardMaterialApprovalFormService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchasingPlanServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchasingPlanServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/StandardMaterialApprovalFormServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/StandardMaterialApprovalFormMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/StandardMaterialApprovalFormMapper.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="FxmlFile" />
-        <option value="Interface" />
-        <option value="Enum" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="$PROJECT_DIR$/../../environment/apache-maven-3.8.7" />
-        <option name="useMavenConfig" value="true" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="MavenRunner">
-    <option name="jreName" value="1.8 (2)" />
-  </component>
-  <component name="ProjectId" id="2MoNGgWCqtSXVy6EjanEiE4vFpu" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="1" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/DLP/dlp-reagent-managment/src/main/java/digital/laboratory/platform/reagent/controller&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
-    &quot;spring.configuration.checksum&quot;: &quot;e1b537e498342b3e852f8ae37a338b30&quot;
-  },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mysql&quot;
-    ]
-  }
-}</component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\DLP\dlp-reagent-managment\src\main\java\digital\laboratory\platform\reagent\controller" />
-      <recent name="D:\DLP\dlp-reagent-managment\src\main\resources\mapper" />
-      <recent name="D:\DLP\dlp-reagent-managment\src\main\java\digital\laboratory\platform\reagent\service\impl" />
-      <recent name="D:\DLP\dlp-reagent-managment\src\main\java\digital\laboratory\platform\reagent\service" />
-      <recent name="D:\DLP\dlp-reagent-managment\src\main\java\digital\laboratory\platform\reagent\mapper" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="digital.laboratory.platform.reagent.config" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="未命名" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <option name="ACTIVE_PROFILES" />
-      <module name="dlp-utilities" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="digital.laboratory.platform.reagent.ReagentManagmentApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="84c9e5ca-eb2c-413b-a858-1d19b01d5e5b" name="变更" comment="" />
-      <created>1678429881754</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1678429881754</updated>
-      <workItem from="1678429883065" duration="2484000" />
-      <workItem from="1678432374353" duration="49000" />
-      <workItem from="1678432753230" duration="1379000" />
-      <workItem from="1678434833015" duration="6037000" />
-      <workItem from="1678669338975" duration="2482000" />
-      <workItem from="1678671930240" duration="5528000" />
-      <workItem from="1678679404655" duration="1433000" />
-      <workItem from="1678687115984" duration="2916000" />
-      <workItem from="1678690316717" duration="3111000" />
-      <workItem from="1678695132199" duration="979000" />
-      <workItem from="1678696216528" duration="1168000" />
-      <workItem from="1678697470161" duration="1697000" />
-      <workItem from="1678699497345" duration="1761000" />
-      <workItem from="1678755842900" duration="6584000" />
-      <workItem from="1678762854893" duration="4317000" />
-      <workItem from="1678773794224" duration="710000" />
-      <workItem from="1678774731732" duration="2171000" />
-      <workItem from="1678777082021" duration="6327000" />
-      <workItem from="1678783815043" duration="4681000" />
-      <workItem from="1678807038390" duration="125000" />
-      <workItem from="1678849456447" duration="18762000" />
-      <workItem from="1678867874350" duration="3143000" />
-      <workItem from="1678871273154" duration="3578000" />
-      <workItem from="1678928423593" duration="23062000" />
-      <workItem from="1678958111942" duration="570000" />
-      <workItem from="1678958765249" duration="2608000" />
-      <workItem from="1678975934346" duration="4000" />
-      <workItem from="1679014668890" duration="26879000" />
-      <workItem from="1679274009195" duration="18335000" />
-      <workItem from="1679300285760" duration="6754000" />
-      <workItem from="1679360591557" duration="2161000" />
-      <workItem from="1679362917535" duration="3349000" />
-      <workItem from="1679366469425" duration="986000" />
-      <workItem from="1679367576370" duration="1529000" />
-      <workItem from="1679369645518" duration="694000" />
-      <workItem from="1679370474838" duration="340000" />
-      <workItem from="1679370889590" duration="8974000" />
-      <workItem from="1679387485299" duration="5639000" />
-      <workItem from="1679446768931" duration="630000" />
-      <workItem from="1679448144707" duration="9960000" />
-      <workItem from="1679464928618" duration="2971000" />
-      <workItem from="1679472803488" duration="4303000" />
-      <workItem from="1679477244805" duration="668000" />
-      <workItem from="1679478073329" duration="1252000" />
-      <workItem from="1679533059731" duration="9838000" />
-      <workItem from="1679551296525" duration="12590000" />
-      <workItem from="1679619645592" duration="23151000" />
-      <workItem from="1679824707171" duration="1435000" />
-      <workItem from="1679909639024" duration="952000" />
-      <workItem from="1679911478145" duration="3770000" />
-      <workItem from="1679965959984" duration="15407000" />
-      <workItem from="1680050907880" duration="9827000" />
-      <workItem from="1680061935691" duration="16725000" />
-      <workItem from="1680156000970" duration="815000" />
-      <workItem from="1680229544321" duration="1095000" />
-      <workItem from="1680231022478" duration="5131000" />
-      <workItem from="1680242660406" duration="10333000" />
-      <workItem from="1680256014432" duration="850000" />
-      <workItem from="1680257258606" duration="291000" />
-      <workItem from="1680483496240" duration="18858000" />
-      <workItem from="1680511437381" duration="1090000" />
-      <workItem from="1680512544339" duration="3856000" />
-      <workItem from="1680570058160" duration="330000" />
-      <workItem from="1680570725430" duration="7069000" />
-      <workItem from="1680577806153" duration="172000" />
-      <workItem from="1680577990955" duration="6627000" />
-      <workItem from="1680593458097" duration="9434000" />
-      <workItem from="1680742925323" duration="11595000" />
-      <workItem from="1680761371129" duration="1359000" />
-      <workItem from="1680762850669" duration="5420000" />
-      <workItem from="1680768923915" duration="5900000" />
-      <workItem from="1680775191381" duration="275000" />
-      <workItem from="1680829227828" duration="19447000" />
-      <workItem from="1680856606492" duration="304000" />
-      <workItem from="1680856968841" duration="407000" />
-      <workItem from="1680857472642" duration="782000" />
-      <workItem from="1680858496064" duration="303000" />
-      <workItem from="1680860028618" duration="706000" />
-      <workItem from="1681088743455" duration="10597000" />
-      <workItem from="1681106733486" duration="158000" />
-      <workItem from="1681106924377" duration="13833000" />
-      <workItem from="1681174897970" duration="9483000" />
-      <workItem from="1681194298954" duration="10405000" />
-      <workItem from="1681208149121" duration="305000" />
-      <workItem from="1681262497438" duration="18128000" />
-      <workItem from="1681288390281" duration="1366000" />
-      <workItem from="1681352714028" duration="22666000" />
-      <workItem from="1681390440499" duration="1028000" />
-      <workItem from="1681398058779" duration="788000" />
-      <workItem from="1681398858196" duration="405000" />
-      <workItem from="1681434106017" duration="3945000" />
-    </task>
-    <task id="LOCAL-00001" summary="3.14">
-      <created>1678807139837</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1678807139837</updated>
-    </task>
-    <task id="LOCAL-00002" summary="3.14">
-      <created>1678938885216</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1678938885216</updated>
-    </task>
-    <task id="LOCAL-00003" summary="3.20">
-      <created>1679279754153</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1679279754153</updated>
-    </task>
-    <task id="LOCAL-00004" summary="3.20">
-      <created>1679279777349</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1679279777349</updated>
-    </task>
-    <task id="LOCAL-00005" summary="3.21">
-      <created>1679360632490</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1679360632490</updated>
-    </task>
-    <task id="LOCAL-00006" summary="3.22">
-      <created>1679535039745</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1679535039745</updated>
-    </task>
-    <task id="LOCAL-00007" summary="4.13">
-      <created>1681398620239</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1681398620239</updated>
-    </task>
-    <task id="LOCAL-00008" summary="4.13">
-      <created>1681398686796</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1681398686796</updated>
-    </task>
-    <task id="LOCAL-00009" summary="4.13">
-      <created>1681398885073</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1681398885073</updated>
-    </task>
-    <task id="LOCAL-00010" summary="4.13">
-      <created>1681399141352</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1681399141352</updated>
-    </task>
-    <option name="localTasksCounter" value="11" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="620af39f-ed60-4639-a1ec-1db7cc5b94d6">
-          <value>
-            <State>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="HEAD" />
-                      </list>
-                    </value>
-                  </entry>
-                  <entry key="structure">
-                    <value>
-                      <list>
-                        <option value="dir:D:/DLP/dlp-reagent-managment/src/main/java/digital/laboratory/platform/reagent" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="main" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-        <entry key="b997d639-3ea6-4a69-ae89-7f14b13d96ac">
-          <value>
-            <State>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="HEAD" />
-                      </list>
-                    </value>
-                  </entry>
-                  <entry key="roots">
-                    <value>
-                      <list>
-                        <option value="$PROJECT_DIR$" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="OPEN_GENERIC_TABS">
-      <map>
-        <entry key="620af39f-ed60-4639-a1ec-1db7cc5b94d6" value="TOOL_WINDOW" />
-        <entry key="b997d639-3ea6-4a69-ae89-7f14b13d96ac" value="TOOL_WINDOW" />
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="3.14" />
-    <MESSAGE value="3.20" />
-    <MESSAGE value="3.21" />
-    <MESSAGE value="3.22" />
-    <MESSAGE value="4.13" />
-    <option name="LAST_COMMIT_MESSAGE" value="4.13" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/PurchaseListServiceImpl.java</url>
-          <line>51</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/DeliveryRegistrationFormServiceImpl.java</url>
-          <line>165</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/digital/laboratory/platform/reagent/service/impl/CheckScheduleServiceImpl.java</url>
-          <line>73</line>
-          <option name="timeStamp" value="19" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="XSLT-Support.FileAssociations.UIState">
-    <expand />
-    <select />
-  </component>
-</project>
@@ -1,12 +0,0 @@
-${AnsiColor.BRIGHT_GREEN}
-
-试剂耗材管理
-试剂耗材管理
-试剂耗材管理
-
-试剂耗材管理(Reagent Managment)
-
-版本: 2022.10.11-snapshots
-创建: ${timestamp}
-
-${AnsiColor.DEFAULT}
@@ -1,30 +0,0 @@
-logging:
-  level:
-    digital.laboratory.platform.camera.mapper: debug
-
-server:
-  port: 5207
-
-mybatis:
-  mapper-locations: classpath*:mapper/*.xml
-
-spring:
-  application:
-    name: dlp-reagent-managment
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${NACOS_HOST:dlp-nacos}:${NACOS_PORT:8848}
-      config:
-        server-addr: ${spring.cloud.nacos.discovery.server-addr}
-        file-extension: yml
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  profiles:
-    active: dev
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: 7990016
-    url: jdbc:mysql://dlp-mysql:3306/reagent_managment?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
--- a/Show More
+++ b/Show More