拉取最新文件提交

chenlu

2024-01-22 d7a79473e92e16768d8967b8cd3552962a238ba8

拉取最新文件提交

 north-glass-erp/.idea/workspace.xml

@@ -5,33 +5,7 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="更改" comment="11.24提交">
      <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProcessCardProgress.vue" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/BaseBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/Device.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/FlowCard.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/OrderBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/ReportingWork.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/Rework.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/SetupBom.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/erp/entity/pp/WorkprogressMonthlySettlement.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/router/index.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/ProductionSchedule.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/Report.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/TeamOutput.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/TeamOutput.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/WorkInProgress.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/report/WorkInProgress.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/AddRework.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/AddRework.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/SelectRework.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/pp/rework/SelectRework.vue" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -73,37 +47,37 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RequestMappingsPanelOrder0": "0",
    "RequestMappingsPanelOrder1": "1",
    "RequestMappingsPanelWidth0": "75",
    "RequestMappingsPanelWidth1": "75",
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
    "WebServerToolWindowFactoryState": "false",
    "git-widget-placeholder": "master",
    "last_opened_file_path": "D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/views/pp/report",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
    "project.structure.last.edited": "模块",
    "project.structure.proportion": "0.0",
    "project.structure.side.proportion": "0.0",
    "settings.editor.selected.configurable": "preferences.pluginManager",
    "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138",
    "ts.external.directory.path": "D:\\软件\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
    "vue.rearranger.settings.migration": "true"
  <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;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;last_opened_file_path&quot;: &quot;D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/views/pp/report&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
    &quot;spring.configuration.checksum&quot;: &quot;def6d90e829e50c63f98c387daecd138&quot;,
    &quot;ts.external.directory.path&quot;: &quot;D:\\软件\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  },
  "keyToStringList": {
    "vue.recent.templates": [
      "Vue Composition API Component"
  &quot;keyToStringList&quot;: {
    &quot;vue.recent.templates&quot;: [
      &quot;Vue Composition API Component&quot;
    ]
  }
}]]></component>
}</component>
  <component name="RecentsManager">
    <key name="CreateClassDialog.RecentsKey">
      <recent name="com.example.erp.tools" />
@@ -132,7 +106,7 @@
      <command value="length" />
    </option>
  </component>
  <component name="RunManager" selected="npm.dev">
  <component name="RunManager" selected="Spring Boot.ErpApplication">
    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
      <option name="arquillianRunConfiguration">
        <value>
@@ -244,7 +218,8 @@
      <workItem from="1703811064202" duration="29032000" />
      <workItem from="1704672037960" duration="1824000" />
      <workItem from="1704931359391" duration="1850000" />
      <workItem from="1705277336625" duration="13043000" />
      <workItem from="1705277336625" duration="14972000" />
      <workItem from="1705881567071" duration="587000" />
    </task>
    <task id="LOCAL-00001" summary="第一次推送">
      <option name="closed" value="true" />