chenqp 1 ano atrás
pai
commit
f97ac7c8f5

+ 379 - 183
.idea/workspace.xml

@@ -1,30 +1,23 @@
 <?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="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="fyy">
+    <list default="true" id="81c9b99b-2ca0-4e39-8f8c-43f20eeca0c2" name="变更" comment="修改">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/Box/BoxHookService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/Box/BoxHookService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/Box/BoxService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/Box/BoxService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/FyyOrderService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/FyyOrderService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/TestController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/TestController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/CommandService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/CommandService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Service/ProductionOrderService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/ProductionOrderService.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/api.php" 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="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+  <component name="ComposerSettings" doNotAsk="true">
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
     <execution />
   </component>
   <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="GitSEFilterConfiguration">
@@ -37,115 +30,135 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration">
     <include_path>
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
-      <path value="$PROJECT_DIR$/vendor/symfony/process" />
-      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
-      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
-      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
-      <path value="$PROJECT_DIR$/vendor/fakerphp/faker" />
-      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
-      <path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
-      <path value="$PROJECT_DIR$/vendor/fruitcake/laravel-cors" />
-      <path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
-      <path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
-      <path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
-      <path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
-      <path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
-      <path value="$PROJECT_DIR$/vendor/php-parallel-lint/php-console-color" />
-      <path value="$PROJECT_DIR$/vendor/php-parallel-lint/php-console-highlighter" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
       <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-client" />
+      <path value="$PROJECT_DIR$/vendor/psr/http-message" />
       <path value="$PROJECT_DIR$/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
       <path value="$PROJECT_DIR$/vendor/psy/psysh" />
       <path value="$PROJECT_DIR$/vendor/filp/whoops" />
       <path value="$PROJECT_DIR$/vendor/opis/closure" />
       <path value="$PROJECT_DIR$/vendor/asm89/stack-cors" />
       <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/ezyang/htmlpurifier" />
+      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
       <path value="$PROJECT_DIR$/vendor/facade/flare-client-php" />
       <path value="$PROJECT_DIR$/vendor/facade/ignition" />
-      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
       <path value="$PROJECT_DIR$/vendor/league/commonmark" />
-      <path value="$PROJECT_DIR$/vendor/league/flysystem" />
       <path value="$PROJECT_DIR$/vendor/league/mime-type-detection" />
+      <path value="$PROJECT_DIR$/vendor/league/flysystem" />
       <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
       <path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
       <path value="$PROJECT_DIR$/vendor/scrivo/highlight.php" />
       <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
       <path value="$PROJECT_DIR$/vendor/egulias/email-validator" />
-      <path value="$PROJECT_DIR$/vendor/laravel/framework" />
       <path value="$PROJECT_DIR$/vendor/laravel/tinker" />
       <path value="$PROJECT_DIR$/vendor/mockery/mockery" />
       <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
       <path value="$PROJECT_DIR$/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/vendor/myclabs/php-enum" />
       <path value="$PROJECT_DIR$/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/vendor/phar-io/manifest" />
       <path value="$PROJECT_DIR$/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
       <path value="$PROJECT_DIR$/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/vendor/phpunit/php-file-iterator" />
       <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/vendor/symfony/console" />
-      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
-      <path value="$PROJECT_DIR$/vendor/symfony/debug" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
       <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
       <path value="$PROJECT_DIR$/vendor/symfony/error-handler" />
-      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
       <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
       <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
-      <path value="$PROJECT_DIR$/vendor/symfony/mime" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/service-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/debug" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/fakerphp/faker" />
+      <path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
+      <path value="$PROJECT_DIR$/vendor/hamcrest/hamcrest-php" />
+      <path value="$PROJECT_DIR$/vendor/fideloper/proxy" />
+      <path value="$PROJECT_DIR$/vendor/fruitcake/laravel-cors" />
+      <path value="$PROJECT_DIR$/vendor/maennchen/zipstream-php" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
+      <path value="$PROJECT_DIR$/vendor/markbaker/complex" />
+      <path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
+      <path value="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet" />
+      <path value="$PROJECT_DIR$/vendor/phpoption/phpoption" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/vendor/nunomaduro/collision" />
+      <path value="$PROJECT_DIR$/vendor/maatwebsite/excel" />
+      <path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
+      <path value="$PROJECT_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
+      <path value="$PROJECT_DIR$/vendor/laravel/framework" />
+      <path value="$PROJECT_DIR$/vendor/dragonmantank/cron-expression" />
+      <path value="$PROJECT_DIR$/vendor/php-parallel-lint/php-console-highlighter" />
+      <path value="$PROJECT_DIR$/vendor/php-parallel-lint/php-console-color" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
     </include_path>
   </component>
-  <component name="ProjectId" id="2QVGg2lShwb30AK1Ppm31IIWnEP" />
+  <component name="ProjectId" id="2jlYFy0KmF1m79LWOh5C3GAgXKO" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "node.js.selected.package.tslint": "(autodetect)"
-  }
-}]]></component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Http\Controllers\Api" />
-      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Model" />
-      <recent name="D:\phpstudy_pro\WWW\jf_admin2.0\app\Service" />
+      <recent name="D:\phpstudy_pro\WWW\hcsl\app\Console\Commands" />
+      <recent name="D:\phpstudy_pro\WWW\hcsl\app\Service" />
+      <recent name="D:\phpstudy_pro\WWW\hcsl\app\Model" />
+      <recent name="D:\phpstudy_pro\WWW\hcsl\app\Jobs" />
+      <recent name="D:\phpstudy_pro\WWW\hcsl\app\Http\Controllers\Api" />
     </key>
   </component>
   <component name="RunManager">
@@ -157,183 +170,366 @@
   <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="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="" />
-      <created>1685431444318</created>
+      <changelist id="81c9b99b-2ca0-4e39-8f8c-43f20eeca0c2" name="变更" comment="" />
+      <created>1721963037232</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1685431444318</updated>
-      <workItem from="1685431446464" duration="71000" />
-      <workItem from="1685595177391" duration="2533000" />
-      <workItem from="1685669123669" duration="2439000" />
-      <workItem from="1685952381761" duration="726000" />
-      <workItem from="1686021203384" duration="14595000" />
-      <workItem from="1686099374239" duration="19779000" />
-      <workItem from="1686185795830" duration="871000" />
-      <workItem from="1689295780705" duration="24032000" />
-      <workItem from="1689556098917" duration="6752000" />
-      <workItem from="1689641978733" duration="1873000" />
-      <workItem from="1689728531740" duration="5283000" />
-      <workItem from="1689837620108" duration="2910000" />
-      <workItem from="1689902257272" duration="2250000" />
-      <workItem from="1690035782838" duration="103000" />
-      <workItem from="1690077617133" duration="2033000" />
-      <workItem from="1690177920127" duration="10062000" />
-      <workItem from="1690247765342" duration="7116000" />
-      <workItem from="1690366710827" duration="615000" />
-      <workItem from="1690438112349" duration="1922000" />
-      <workItem from="1690521339535" duration="8403000" />
-      <workItem from="1690599347262" duration="1259000" />
-      <workItem from="1690603154164" duration="261000" />
-      <workItem from="1690605045643" duration="87000" />
-      <workItem from="1690625873796" duration="19000" />
-      <workItem from="1690720108633" duration="4211000" />
-      <workItem from="1690765520010" duration="19174000" />
-      <workItem from="1690852371561" duration="9800000" />
-      <workItem from="1690938513232" duration="8893000" />
-      <workItem from="1691023846625" duration="6703000" />
-      <workItem from="1691110525530" duration="2375000" />
-      <workItem from="1691382914683" duration="297000" />
-      <workItem from="1691489537588" duration="6041000" />
-      <workItem from="1691542453161" duration="8574000" />
+      <updated>1721963037232</updated>
+      <workItem from="1721963040228" duration="13274000" />
+      <workItem from="1721981327132" duration="3411000" />
+      <workItem from="1722152628158" duration="707000" />
+      <workItem from="1722159973124" duration="605000" />
+      <workItem from="1722214741749" duration="4712000" />
+      <workItem from="1722248525809" duration="599000" />
+      <workItem from="1722301617583" duration="3972000" />
+      <workItem from="1722386870927" duration="9941000" />
+      <workItem from="1722407147742" duration="9707000" />
+      <workItem from="1722474193236" duration="27130000" />
+      <workItem from="1722560464114" duration="27063000" />
+      <workItem from="1722819429672" duration="14938000" />
+      <workItem from="1722905478224" duration="12479000" />
+      <workItem from="1722992799108" duration="4436000" />
+      <workItem from="1723078905484" duration="1789000" />
+      <workItem from="1723165394175" duration="981000" />
+      <workItem from="1723423597269" duration="2874000" />
+      <workItem from="1723511233569" duration="592000" />
+      <workItem from="1723597498437" duration="593000" />
+      <workItem from="1723684234560" duration="2252000" />
+      <workItem from="1723770866503" duration="1299000" />
+      <workItem from="1723862822290" duration="1636000" />
+      <workItem from="1724028860098" duration="1335000" />
+      <workItem from="1725346418386" duration="6155000" />
+      <workItem from="1725411752150" duration="8562000" />
+      <workItem from="1725498444356" duration="2192000" />
+      <workItem from="1725506151545" duration="15118000" />
+      <workItem from="1725585043899" duration="14727000" />
+      <workItem from="1725702109785" duration="593000" />
+      <workItem from="1725843938652" duration="8592000" />
+      <workItem from="1725929962713" duration="1641000" />
+      <workItem from="1726017035147" duration="635000" />
+      <workItem from="1726308904150" duration="795000" />
+      <workItem from="1726572195940" duration="2969000" />
+      <workItem from="1726621154096" duration="9455000" />
+      <workItem from="1726649372658" duration="12029000" />
+      <workItem from="1726706962262" duration="31832000" />
+      <workItem from="1726749946106" duration="4170000" />
+      <workItem from="1726793639170" duration="7998000" />
+      <workItem from="1726802034150" duration="14125000" />
+      <workItem from="1726886853080" duration="1450000" />
+      <workItem from="1726981348438" duration="1655000" />
+      <workItem from="1727053173021" duration="1557000" />
+      <workItem from="1727139509540" duration="592000" />
+      <workItem from="1727226426468" duration="2311000" />
+      <workItem from="1727402773184" duration="4810000" />
     </task>
-    <task id="LOCAL-00001" summary="jf2.0">
-      <created>1689228284141</created>
+    <task id="LOCAL-00001" summary="修改">
+      <created>1721963701791</created>
       <option name="number" value="00001" />
       <option name="presentableId" value="LOCAL-00001" />
       <option name="project" value="LOCAL" />
-      <updated>1689228284141</updated>
+      <updated>1721963701792</updated>
     </task>
-    <task id="LOCAL-00002" summary="fyy">
-      <created>1689316707927</created>
+    <task id="LOCAL-00002" summary="修改">
+      <created>1721963881505</created>
       <option name="number" value="00002" />
       <option name="presentableId" value="LOCAL-00002" />
       <option name="project" value="LOCAL" />
-      <updated>1689316707927</updated>
+      <updated>1721963881505</updated>
     </task>
-    <task id="LOCAL-00003" summary="fyy">
-      <created>1689732347737</created>
+    <task id="LOCAL-00003" summary="修改">
+      <created>1721974920878</created>
       <option name="number" value="00003" />
       <option name="presentableId" value="LOCAL-00003" />
       <option name="project" value="LOCAL" />
-      <updated>1689732347737</updated>
+      <updated>1721974920878</updated>
     </task>
-    <task id="LOCAL-00004" summary="fyy">
-      <created>1690248269830</created>
+    <task id="LOCAL-00004" summary="修改">
+      <created>1721980944472</created>
       <option name="number" value="00004" />
       <option name="presentableId" value="LOCAL-00004" />
       <option name="project" value="LOCAL" />
-      <updated>1690248269831</updated>
+      <updated>1721980944472</updated>
     </task>
-    <task id="LOCAL-00005" summary="fyy">
-      <created>1690249897762</created>
+    <task id="LOCAL-00005" summary="修改">
+      <created>1722324578035</created>
       <option name="number" value="00005" />
       <option name="presentableId" value="LOCAL-00005" />
       <option name="project" value="LOCAL" />
-      <updated>1690249897762</updated>
+      <updated>1722324578035</updated>
     </task>
-    <task id="LOCAL-00006" summary="fyy 测试接口">
-      <created>1690530139470</created>
+    <task id="LOCAL-00006" summary="修改">
+      <created>1722395241158</created>
       <option name="number" value="00006" />
       <option name="presentableId" value="LOCAL-00006" />
       <option name="project" value="LOCAL" />
-      <updated>1690530139470</updated>
+      <updated>1722395241158</updated>
     </task>
-    <task id="LOCAL-00007" summary="fyy 测试数据">
-      <created>1690532867480</created>
+    <task id="LOCAL-00007" summary="修改">
+      <created>1722412986721</created>
       <option name="number" value="00007" />
       <option name="presentableId" value="LOCAL-00007" />
       <option name="project" value="LOCAL" />
-      <updated>1690532867480</updated>
+      <updated>1722412986721</updated>
     </task>
-    <task id="LOCAL-00008" summary="fyy">
-      <created>1690953748966</created>
+    <task id="LOCAL-00008" summary="修改">
+      <created>1722593322588</created>
       <option name="number" value="00008" />
       <option name="presentableId" value="LOCAL-00008" />
       <option name="project" value="LOCAL" />
-      <updated>1690953748966</updated>
+      <updated>1722593322588</updated>
     </task>
-    <task id="LOCAL-00009" summary="fyy">
-      <created>1691042581507</created>
+    <task id="LOCAL-00009" summary="修改">
+      <created>1722836906071</created>
       <option name="number" value="00009" />
       <option name="presentableId" value="LOCAL-00009" />
       <option name="project" value="LOCAL" />
-      <updated>1691042581507</updated>
+      <updated>1722836906071</updated>
     </task>
-    <task id="LOCAL-00010" summary="fyy">
-      <created>1691489715976</created>
+    <task id="LOCAL-00010" summary="修改">
+      <created>1722837938394</created>
       <option name="number" value="00010" />
       <option name="presentableId" value="LOCAL-00010" />
       <option name="project" value="LOCAL" />
-      <updated>1691489715976</updated>
+      <updated>1722837938394</updated>
     </task>
-    <task id="LOCAL-00011" summary="fyy">
-      <created>1691495150166</created>
+    <task id="LOCAL-00011" summary="修改">
+      <created>1722912207737</created>
       <option name="number" value="00011" />
       <option name="presentableId" value="LOCAL-00011" />
       <option name="project" value="LOCAL" />
-      <updated>1691495150166</updated>
+      <updated>1722912207737</updated>
     </task>
-    <task id="LOCAL-00012" summary="fyy">
-      <created>1695118669269</created>
+    <task id="LOCAL-00012" summary="修改">
+      <created>1722912809745</created>
       <option name="number" value="00012" />
       <option name="presentableId" value="LOCAL-00012" />
       <option name="project" value="LOCAL" />
-      <updated>1695118669269</updated>
+      <updated>1722912809745</updated>
+    </task>
+    <task id="LOCAL-00013" summary="修改">
+      <created>1722915223268</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1722915223268</updated>
+    </task>
+    <task id="LOCAL-00014" summary="修改">
+      <created>1722922457850</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1722922457850</updated>
+    </task>
+    <task id="LOCAL-00015" summary="调整">
+      <created>1725350235778</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1725350235778</updated>
+    </task>
+    <task id="LOCAL-00016" summary="修改">
+      <created>1725416032689</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1725416032689</updated>
+    </task>
+    <task id="LOCAL-00017" summary="修改">
+      <created>1725420118016</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1725420118016</updated>
+    </task>
+    <task id="LOCAL-00018" summary="修改">
+      <created>1725441601755</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1725441601755</updated>
+    </task>
+    <task id="LOCAL-00019" summary="修改">
+      <created>1725525757092</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1725525757092</updated>
+    </task>
+    <task id="LOCAL-00020" summary="修改">
+      <created>1725607104575</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1725607104575</updated>
+    </task>
+    <task id="LOCAL-00021" summary="修改">
+      <created>1725611548066</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1725611548066</updated>
+    </task>
+    <task id="LOCAL-00022" summary="修改">
+      <created>1725851771906</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1725851771906</updated>
+    </task>
+    <task id="LOCAL-00023" summary="修改">
+      <created>1725864733515</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1725864733515</updated>
+    </task>
+    <task id="LOCAL-00024" summary="修改">
+      <created>1725867621444</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1725867621444</updated>
+    </task>
+    <task id="LOCAL-00025" summary="修改">
+      <created>1726741053177</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1726741053177</updated>
+    </task>
+    <task id="LOCAL-00026" summary="修改">
+      <created>1726754128722</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1726754128722</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00027" summary="修改">
+      <created>1726794418213</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1726794418213</updated>
+    </task>
+    <task id="LOCAL-00028" summary="修改">
+      <created>1726799552674</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1726799552674</updated>
+    </task>
+    <task id="LOCAL-00029" summary="修改">
+      <created>1726825808025</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1726825808025</updated>
+    </task>
+    <task id="LOCAL-00030" summary="修改">
+      <created>1726826769179</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1726826769179</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+        <entry key="e38c0838-7ac4-4863-8200-bf05e7b441af">
+          <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="e38c0838-7ac4-4863-8200-bf05e7b441af" value="TOOL_WINDOW" />
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="jf2.0" />
-    <MESSAGE value="fyy 测试接口" />
-    <MESSAGE value="fyy 测试数据" />
-    <MESSAGE value="fyy" />
-    <option name="LAST_COMMIT_MESSAGE" value="fyy" />
+    <MESSAGE value="调整" />
+    <MESSAGE value="修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="php-line-method">
-          <url>file://$PROJECT_DIR$/app/Service/TechnologyService.php</url>
-          <line>14</line>
+          <url>file://$PROJECT_DIR$/app/Service/Box/BoxService.php</url>
+          <line>952</line>
           <properties>
-            <option name="className" value="\App\Service\TechnologyService" />
-            <option name="methodName" value="basicProcessList" />
+            <option name="className" value="\App\Service\Box\BoxService" />
+            <option name="methodName" value="boxFhDel" />
           </properties>
-          <option name="timeStamp" value="2" />
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
-          <url>file://$PROJECT_DIR$/app/Service/ProcessService.php</url>
-          <line>108</line>
+          <url>file://$PROJECT_DIR$/app/Service/FyySqlServerService.php</url>
+          <line>453</line>
           <properties>
-            <option name="className" value="\App\Service\ProcessService" />
-            <option name="methodName" value="processAdd" />
+            <option name="className" value="\App\Service\FyySqlServerService" />
+            <option name="methodName" value="getBoxData" />
           </properties>
-          <option name="timeStamp" value="3" />
+          <option name="timeStamp" value="5" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
-          <url>file://$PROJECT_DIR$/app/Http/Controllers/Api/TestController.php</url>
-          <line>111</line>
+          <url>file://$PROJECT_DIR$/app/Service/Box/BoxService.php</url>
+          <line>311</line>
           <properties>
-            <option name="className" value="\App\Http\Controllers\Api\TestController" />
-            <option name="methodName" value="output_value_month1" />
+            <option name="className" value="\App\Service\Box\BoxService" />
+            <option name="methodName" value="saveOutOrder" />
           </properties>
-          <option name="timeStamp" value="5" />
+          <option name="timeStamp" value="6" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/routes/api.php</url>
-          <line>21</line>
+          <url>file://$PROJECT_DIR$/app/Http/Controllers/Api/FyyOrderController.php</url>
+          <line>20</line>
           <option name="timeStamp" value="4" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/app/Service/FyySqlServerService.php</url>
-          <line>326</line>
-          <option name="timeStamp" value="6" />
+          <url>file://$PROJECT_DIR$/app/Service/CommandService.php</url>
+          <line>145</line>
+          <option name="timeStamp" value="8" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>

+ 6 - 0
app/Http/Controllers/Api/TestController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 
 use App\Service\Box\BoxService;
+use App\Service\ProductionOrderService;
 
 class TestController extends BaseController
 {
@@ -11,4 +12,9 @@ class TestController extends BaseController
         (new BoxService())->delBoxLock();
         dd(1);
     }
+
+    public function  delTestQ2(){
+        (new ProductionOrderService())->delBoxLock();
+        dd(1);
+    }
 }

+ 6 - 6
app/Service/CommandService.php

@@ -43,7 +43,7 @@ class CommandService extends Service
                     'mark' => $msg,
                     'del_time' => 1,
                 ]);
-            $this->delList($result);
+            (new ProductionOrderService())->delBoxLock();
             return;
         }
 
@@ -54,7 +54,7 @@ class CommandService extends Service
                     'mark' => '单据号生成失败',
                     'del_time' => 1,
                 ]);
-            $this->delList($result);
+            (new ProductionOrderService())->delBoxLock();
             return;
         }
 
@@ -101,11 +101,11 @@ class CommandService extends Service
 
                 $count = $other_map[$value['sale_orders_product_id']] ?? 0;
                 for ($i = 1; $i <= $quantity_tmp; $i++) {
-                    if($size == 500){
+                    if($size == 100){
                         $this->batchInsertData($boom,$process,$time_arr);
                         unset($boom);unset($process);
                         $size = 0;
-                        echo "500条写入成功";
+                        echo "100条写入成功";
                     }
 
                     $boom[$time_tmp][] = [
@@ -149,10 +149,10 @@ class CommandService extends Service
                     'is_use' => 2
                 ]);
 
-            $this->delList($result);
+            (new ProductionOrderService())->delBoxLock();
             DB::commit();
         }catch (\Exception $e){
-            $this->delList($result);
+            (new ProductionOrderService())->delBoxLock();
             DB::rollBack();
             CommandList::where('id', $id)
                 ->update([

+ 8 - 7
app/Service/ProductionOrderService.php

@@ -20,6 +20,8 @@ use Maatwebsite\Excel\Facades\Excel;
  */
 class ProductionOrderService extends Service
 {
+    public $lock_key = 'hc_production_add';
+
     public function edit($data){}
 
     public function setOrderNO(){
@@ -50,13 +52,8 @@ class ProductionOrderService extends Service
         list($status,$msg) = $this->orderRule($data);
         if(!$status) return [$status,$msg];
 
-        //生成键值限制
-        foreach ($msg[0] as $value){
-            $key = "productionAdd" . $value['sale_orders_product_id'];
-            list($status,$msg) = $this->limitingSendRequestBackgNeed($key);
-            if(! $status) return [false, '销售订单正在生成生产订单数据,请稍后尝试!'];
-
-        }
+        list($status,$msg) = $this->limitingSendRequestBackgNeed($this->lock_key);
+        if(! $status) return [false, '销售订单正在生成生产订单数据,请稍后尝试!'];
 
         $insert_data = [
             'data' => $data,
@@ -161,6 +158,10 @@ class ProductionOrderService extends Service
         //以下用不到-----------------------------
     }
 
+    public function delBoxLock(){
+        $this->dellimitingSendRequestBackgNeed($this->lock_key);
+    }
+
     public function del($data){
         if($this->isEmpty($data,'id')) return [false,'ID不能为空!'];
 

+ 2 - 1
routes/api.php

@@ -28,7 +28,8 @@ Route::any('ttt','Api\TestController@ttt');
 Route::any('tttt','Api\TestController@tttt');
 Route::any('getProductionOrder/{file_name}','Api\ProductionOrderController@getItemFile');
 Route::any('getCloudData','Api\CloudDataController@getCloudData');
-Route::any('delTestQ','Api\TestController@delTestQ');
+Route::any('delTestQ','Api\TestController@delTestQ');//包装
+Route::any('delTestQ2','Api\TestController@delTestQ2');//生产
 
 Route::any('output_value','Api\ScreenController@output_value');
 Route::any('order_process1','Api\ScreenController@order_process1');