调整耗材记录

.idea/workspace.xml

@@ -2,7 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="33a373ef-8a77-410d-8903-f96d9ffe27f3" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" 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" />
       <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
@@ -19,11 +23,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" />
+            <state relative-caret-position="753">
+              <caret line="326" column="6" selection-start-line="326" selection-start-column="6" selection-end-line="326" selection-end-column="6" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -32,70 +39,70 @@
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="161">
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+              <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="317">
-              <caret line="293" column="46" selection-start-line="293" selection-start-column="46" selection-end-line="293" selection-end-column="46" />
+            <state relative-caret-position="287">
+              <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="62">
-              <caret line="364" column="65" selection-start-line="364" selection-start-column="65" selection-end-line="364" selection-end-column="65" />
+            <state relative-caret-position="253">
+              <caret line="478" selection-start-line="478" selection-end-line="478" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="70" column="60" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="60" />
+            <state relative-caret-position="425">
+              <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemSettingService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+            <state relative-caret-position="108">
+              <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="292">
-              <caret line="135" column="58" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="58" />
+            <state relative-caret-position="701">
+              <caret line="139" column="48" selection-start-line="136" selection-start-column="4" selection-end-line="139" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="920">
-              <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
+            <state relative-caret-position="677">
+              <caret line="152" column="45" selection-start-line="152" selection-start-column="45" selection-end-line="152" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="308" column="44" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" />
+            <state relative-caret-position="272">
+              <caret line="12" column="15" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -104,18 +111,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>closeOrder</find>
-      <find>!= 8</find>
-      <find>importRepairClassesSettingExcel</find>
-      <find>提交订单</find>
-      <find>连接成功</find>
-      <find>提交失败</find>
-      <find>clssses</find>
-      <find>transferApply</find>
-      <find>reportExport</find>
-      <find>yyyy-MM-dd</find>
-      <find>receiveSendOrders</find>
-      <find>dateNow</find>
       <find>receiveOwnOrders</find>
       <find>getRepairsByShiftIds</find>
       <find>receiveOrders</find>
@@ -124,14 +119,28 @@
       <find>and rdr.users_id in</find>
       <find>as finished_count</find>
       <find>&lt;if test=&quot;maintenanceName != null and maintenanceName != ''&quot;&gt;</find>
-      <find>queryUserData</find>
       <find>getRepairsShiftIdByHour</find>
       <find>queryManageCount</find>
       <find>isDuty</find>
       <find>canceled_count</find>
       <find>nowDate</find>
       <find>//2023-10-08 看是否是值班时间接单</find>
+      <find>queryChangePriceConsumables</find>
+      <find>repairChangeConsumes</find>
       <find>shifts</find>
+      <find>queryUserData</find>
+      <find>alterPrice</find>
+      <find>insertMaintenanceConsumables</find>
+      <find>alterPrice(</find>
+      <find>维修单不是待确认状态，无法进行改价操作</find>
+      <find>goodsList</find>
+      <find>details</find>
+      <find>getRepairsByRecordIds</find>
+      <find>getRepairsByRecordId</find>
+      <find>getTechniciansByUserId</find>
+      <find>queryTeamWorkPage</find>
+      <find>报价</find>
+      <find>changeMaintenanceConsumables</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -146,7 +155,9 @@
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairRecordMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java" />
       </list>
     </option>
   </component>
@@ -178,8 +189,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="953" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -265,11 +276,6 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="repair" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
-              <item name="target" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -325,18 +331,17 @@
       <updated>1696037190094</updated>
       <workItem from="1696037191371" duration="1987000" />
       <workItem from="1696640152665" duration="87000" />
-      <workItem from="1696640887168" duration="31756000" />
+      <workItem from="1696640887168" duration="43402000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33830000" />
+    <option name="totallyTimeSpent" value="45476000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="958" height="1039" extended-state="0" />
-    <editor active="true" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2650334" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.36761487" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -348,8 +353,8 @@
       <window_info anchor="bottom" id="Messages" weight="0.32928178" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.33041576" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.71115977" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.33370167" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.6718232" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -365,7 +370,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.96659243" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.6597374" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -389,27 +394,21 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1613</line>
+          <line>1623</line>
           <properties />
           <option name="timeStamp" value="7" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>1213</line>
+          <line>1223</line>
           <properties />
           <option name="timeStamp" value="9" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>335</line>
-          <properties />
-          <option name="timeStamp" value="11" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
-          <line>381</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java</url>
+          <line>358</line>
           <properties />
-          <option name="timeStamp" value="12" />
+          <option name="timeStamp" value="13" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -516,13 +515,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="308" column="44" selection-start-line="308" selection-start-column="44" selection-end-line="308" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairSystemSettingService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -530,13 +522,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="135" column="58" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairShiftSettingsServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="269">
@@ -551,6 +536,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/math/BigDecimal.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="1480" column="22" selection-start-line="1480" selection-start-column="22" selection-end-line="1480" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairConsumablesMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="453">
+          <caret line="70" column="33" lean-forward="true" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="62">
@@ -558,31 +564,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="920">
-          <caret line="43" selection-start-line="43" selection-end-line="45" selection-end-column="57" />
+        <state relative-caret-position="292">
+          <caret line="135" column="58" selection-start-line="135" selection-start-column="45" selection-end-line="135" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="12" column="15" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/DetailsVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="701">
+          <caret line="139" column="48" selection-start-line="136" selection-start-column="4" selection-end-line="139" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/PageUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="295">
+          <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairLeaveMessage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="332">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairConsumablesService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="34" column="48" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/vo/RepairTechnicianVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="677">
+          <caret line="152" column="45" selection-start-line="152" selection-start-column="45" selection-end-line="152" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairConsumablesServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="65" column="13" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="753">
+          <caret line="326" column="6" selection-start-line="326" selection-start-column="6" selection-end-line="326" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/ReceiveSendOrdersRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="287">
+          <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumablesController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="350" column="27" selection-start-line="350" selection-start-column="27" selection-end-line="350" selection-end-column="27" />
+        <state relative-caret-position="253">
+          <caret line="478" selection-start-line="478" selection-end-line="478" />
         </state>
       </provider>
     </entry>

src/main/java/com/repair/controller/RepairConsumablesController.java

@@ -1,6 +1,7 @@
 package com.repair.controller;
 
 
+import com.alibaba.fastjson.JSON;
 import com.repair.api.RepairConsumablesControllerAPI;
 import com.repair.common.utils.*;
 import com.repair.model.enumModel.eIsSuper;
@@ -206,6 +207,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult InsertMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
+        System.out.println("报价确认提交" + JSON.toJSON(data));
+
         try {
             if (bindingResult.hasErrors()) {
                 String st = paramUtils.getParamError(bindingResult);
@@ -327,8 +330,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
             return CommonResult.fail("维修单已失效，改价失败");
         }
 
-        if (rr.getMaintenanceState() != eRecordStatu.ToConfirmed.getValue()) {
-            return CommonResult.fail("维修单不是待确认状态，无法进行改价操作");
+        if (rr.getMaintenanceState() != eRecordStatu.ToLogistics.getValue()) {
+            return CommonResult.fail("维修单不是待处理状态，无法进行改价操作");
         }
         ChangePriceConsumeVo result = new ChangePriceConsumeVo();
         result.setRecordId(recordId);
@@ -353,6 +356,8 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult changeMaintenanceConsumables(MaintenanceConsumeablesRequest data, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
+        System.out.println("改价确认提交" + JSON.toJSON(data));
+
         try {
             if (bindingResult.hasErrors()) {
                 String st = paramUtils.getParamError(bindingResult);
@@ -383,9 +388,10 @@ public class RepairConsumablesController implements RepairConsumablesControllerA
                 RepairConsumables rcData = new RepairConsumables();
                 if (rc.getId() != null && rc.getId() > 0) {
                     rcData.setId(rc.getId());
-                } else {
-                    rcData.setId(0);
                 }
+//                else {
+//                    rcData.setId(0);
+//                }
                 rcData.setRecordId(data.getRecordId());
                 rcData.setArticleId(rc.getArticleId());
                 rcData.setConsumeId(rc.getConsumeId());

src/main/java/com/repair/controller/RepairRecordController.java

@@ -840,6 +840,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
         }
 
+        //2023-10-09 A-jax 添加获取耗材记录详情方法
+        if(result.getList().size() > 0){
+            List<Integer> recordIds = result.getList().stream().map(RepairTechnicianVo::getId).collect(Collectors.toList());
+            List<RepairConsumables> consumables = repairConsumablesService.getRepairsByRecordIds(recordIds);
+            for (RepairTechnicianVo data :result.getList()) {
+                List<RepairConsumables> datas = consumables.stream().filter(e -> e.getRecordId().equals(data.getId())).collect(Collectors.toList());
+                data.setGoodsList(datas);
+            }
+        }
+
         return CommonResult.ok(result);
     }
 
@@ -2278,6 +2288,8 @@ public class RepairRecordController implements RepairRecordControllerAPI {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public CommonResult alterPrice(AlterPriceRequest apr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) throws Exception {
+        System.out.println("改价操作" + JSON.toJSON(apr));
+
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
@@ -4472,6 +4484,16 @@ public class RepairRecordController implements RepairRecordControllerAPI {
                 break;
         }
 
+        //2023-10-09 A-jax 添加获取耗材记录详情方法
+        if(result.getList().size() > 0){
+            List<Integer> recordIds = result.getList().stream().map(RepairTechnicianVo::getId).collect(Collectors.toList());
+            List<RepairConsumables> consumables = repairConsumablesService.getRepairsByRecordIds(recordIds);
+            for (RepairTechnicianVo data :result.getList()) {
+                List<RepairConsumables> datas = consumables.stream().filter(e -> e.getRecordId().equals(data.getId())).collect(Collectors.toList());
+                data.setGoodsList(datas);
+            }
+        }
+
         return CommonResult.ok(result);
     }
 }

src/main/java/com/repair/model/vo/RepairTechnicianVo.java

@@ -2,6 +2,7 @@ package com.repair.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.repair.model.enumModel.eRecordStatu;
+import com.repair.model.pojo.RepairConsumables;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -145,4 +146,9 @@ public class RepairTechnicianVo {
      * 师傅维修修录音时长
      */
     private Integer finishVoiceLength;
+
+    /**
+     * 耗材详情集合
+     */
+    private List<RepairConsumables> goodsList;
 }

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: dev
+      active: prod
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制

target/classes/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: dev
+      active: prod
   servlet:
     multipart:
       max-file-size: 30MB     #单个文件最大限制