修bug

ruoyi-admin-vue/src/views/inventory/orders/index.vue

@@ -94,7 +94,7 @@
               v-for="dict in dict.type.outbound_order_type"
               :key="dict.value"
               :label="dict.label"
-              :value="dict.value"
+              :value="Number(dict.value)"
             />
           </el-select>
         </el-form-item>
@@ -133,7 +133,7 @@
             style="width: 100%"
           >
             <el-option
-              v-for="dict in dict.type.inbound_order_status"
+              v-for="dict in dict.type.outbound_order_status"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -218,7 +218,7 @@
           </el-table-column>
           <el-table-column label="订单状态" align="center" prop="orderStatus" width="150">
             <template slot-scope="scope">
-              <dict-tag v-if="dict.type.inbound_order_status" :options="dict.type.inbound_order_status" :value="scope.row.orderStatus"/>
+              <dict-tag v-if="dict.type.outbound_order_status" :options="dict.type.outbound_order_status" :value="scope.row.orderStatus"/>
               <span v-else>-</span>
             </template>
           </el-table-column>
@@ -317,7 +317,7 @@
                   v-for="item in dict.type.order_type" 
                   :key="item.value" 
                   :label="item.label" 
-                  :value="item.value"
+                  :value="Number(item.value)"
                 >
                   <span style="margin-left: 8px;">{{ item.label }}</span>
                 </el-option>
@@ -541,7 +541,7 @@ import PageTitle from "@/components/PageTitle"
 import ImportExcel from "@/components/ImportExcel/index"
 export default {
   name: "Orders",
-  dicts: ['outbound_order_type', 'inbound_order_type', 'inbound_order_status', 'label_color','order_type'],
+  dicts: ['outbound_order_type', 'inbound_order_type', 'outbound_order_status', 'label_color','order_type'],
   components: {
     OutboundOrderFormWithItems,
     WarehouseSelector,

ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -336,52 +336,6 @@
         </where>
         order by w.warehouses_code, sl.location_code, material_id desc
     </select>
-    <resultMap type="com.ruoyi.inventory.domain.vo.InventoryVo" id="InventoryVoResult">
-        <result property="id"    column="id"    />
-        <result property="inventoryType"    column="inventory_type"    />
-        <result property="orderId"    column="order_id"    />
-        <result property="materialId"    column="material_id"    />
-        <result property="batchId"    column="batch_id"    />
-        <result property="warehousesCode"    column="warehouses_code"    />
-        <result property="locationId"    column="location_id"    />
-        <result property="ownerId"    column="owner_id"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="lockedQuantity"    column="locked_quantity"    />
-        <result property="unitWeight"    column="unit_weight"    />
-        <result property="totalWeight"    column="total_weight"    />
-        <result property="totalVolume"    column="total_volume"    />
-        <result property="productionDate"    column="production_date"    />
-        <result property="expirationDate"    column="expiration_date"    />
-        <result property="inventoryStatus"    column="inventory_status"    />
-        <result property="lastInboundTime"    column="last_inbound_time"    />
-        <result property="lastOutboundTime"    column="last_outbound_time"    />
-        <result property="isUsed"    column="is_used"    />
-        <result property="sortNo"    column="sort_no"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createUserCode"    column="create_user_code"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateUserCode"    column="update_user_code"    />
-        <result property="warehousesId"    column="warehouses_id"    />
-        <result property="materialName"    column="material_name"    />
-        <result property="minStockLevel" column="min_stock_level" jdbcType="BIGINT"/>
-        <result property="maxStockLevel" column="max_stock_level" jdbcType="BIGINT"/>
-        <result property="sapNo"    column="sap_no"    />
-        <result property="tsCode"    column="ts_code"    />
-        <result property="hazardId"    column="hazard_id"    />
-        <result property="specification"    column="specification"    />
-        <result property="materialUnit"    column="material_unit"    />
-        <result property="unitWeight"    column="unit_weight"    />
-        <result property="packageWeight"    column="package_weight"    />
-        <result property="totalWeight"    column="total_weight"    />
-        <result property="volume"    column="volume"    />
-        <result property="shelfLifeDays"    column="shelf_life_days"    />
-        <result property="storageTemperature"    column="storage_temperature"    />
-        <result property="specialRequirements"    column="special_requirements"    />
-        <result property="alterType"    column="alterType"    />
-        <result property="warehousesName"    column="warehouses_name"    />
-        <result property="locationName"    column="location_name"    />
-        <result property="ownerName"    column="owner_name"    />
-    </resultMap>
 
     <select id="selectInventoryVoList" parameterType="Inventory" resultMap="InventoryVoResult">
         <include refid="selectInventoryDetailVo"/>