页面修改

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

@@ -688,7 +688,7 @@ export default {
         // 严格模式下校验
         validRows = rowsWithActualQty.filter((row, index) => {
           const rowErrors = [];
-          const rowName = `第${index + 1}行【${row.materialName || '未知物料'}】(inventoryId:${row.inventoryId})`;
+          const rowName = `第${index + 1}行【${row.materialName || '未知物料'}】`;
           const availableQty = (row.quantity || 0) - (row.lockedQuantity || 0);
 
           // 校验实际数量

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

@@ -100,7 +100,7 @@
             style="width: 150px"
           >
            <el-option
-              v-for="dict in dict.type.order_type"
+              v-for="dict in dict.type.outbound_order_type"
               :key="dict.value"
               :label="dict.label"
               :value="Number(dict.value)"
@@ -174,7 +174,7 @@
           <el-table-column label="系统编号" align="center" prop="systemNo" min-width="150" />
           <el-table-column label="订单类型" align="center" prop="orderTypeId" min-width="120">
             <template slot-scope="scope">
-              <dict-tag v-if="dict.type.order_type" :options="dict.type.order_type" :value="scope.row.orderTypeId"/>
+              <dict-tag v-if="dict.type.outbound_order_type" :options="dict.type.outbound_order_type" :value="scope.row.orderTypeId"/>
               <span v-else>-</span>
             </template>
           </el-table-column>
@@ -273,7 +273,7 @@
             <el-form-item label="订单类型" prop="orderTypeId">
               <el-select v-model="form.orderTypeId" placeholder="请选择订单类型" :disabled="isViewDetail || formDisabled.orderTypeId" style="width: 100%">
                 <el-option
-                  v-for="item in dict.type.order_type"
+                  v-for="item in dict.type.outbound_order_type"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -500,7 +500,7 @@ import PageTitle from "@/components/PageTitle"
 import ImportExcel from "@/components/ImportExcel/index"
 export default {
   name: "Orders",
-  dicts: ['outbound_order_type', 'outbound_order_status', 'label_color','order_type'],
+  dicts: ['outbound_order_type', 'outbound_order_status', 'label_color'],
   components: {
     OutboundOrderFormWithItems,
     WarehouseSelector,
@@ -1174,11 +1174,6 @@ export default {
       this.formDisabled = {
         orderId: false,
         systemNo: false,
-        orderTypeId: false,
-        batchCode: false,
-        warehouseId: false,
-        ownerId: false,
-        outboundOrderId: false
       }
       // 重置查看/编辑状态
       this.isViewDetail = false
@@ -1245,11 +1240,6 @@ export default {
       this.formDisabled = {
         orderId: false,
         systemNo: false,
-        orderTypeId: false,
-        batchCode: false,
-        warehouseId: false,
-        ownerId: false,
-        outboundOrderId: false
       }
       // 核心修改：设置出库日期默认值为当前日期
   const today = new Date()
@@ -1341,11 +1331,6 @@ export default {
       this.formDisabled = {
         orderId: true, // 编辑时禁用出货单号修改
         systemNo: true,
-        orderTypeId: true,
-        batchCode: true,
-        warehouseId: true,
-        ownerId: true,
-        outboundOrderId: true
       }
       const id = row.id || this.ids
       getOrders(id).then(response => {

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

@@ -322,6 +322,7 @@
                 left join warehouses w on i.warehouses_id = w.id
                 left join storage_locations sl on i.location_id = sl.id
                 left join owners o on i.owner_id = o.id
+                left join outbound_orders oo on i.order_id = oo.id and oo.is_used = 1
     </sql>
     <select id="selectInventoryDetailList" parameterType="Inventory" resultMap="InventoryResult">
         <include refid="selectInventoryDetailVo"/>
@@ -335,7 +336,7 @@
             <if test="ownerId != null  and ownerId != ''"> and i.owner_id = #{ownerId}</if>
             <if test="inventoryStatus != null "> and i.inventory_status = #{inventoryStatus}</if>
         </where>
-        order by w.warehouses_code, sl.location_code, material_id desc
+        order by i.create_time desc, oo.order_status asc
     </select>
 
     <select id="selectInventoryVoList" parameterType="Inventory" resultMap="InventoryVoResult">
@@ -350,7 +351,7 @@
             <if test="ownerId != null  and ownerId != ''"> and i.owner_id = #{ownerId}</if>
             <if test="inventoryStatus != null "> and i.inventory_status = #{inventoryStatus}</if>
         </where>
-        order by w.warehouses_code, sl.location_code, material_id desc
+        order by i.create_time desc, oo.order_status asc
     </select>
 
     <select id="selectInventory" parameterType="Inventory" resultMap="InventoryResult">

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

@@ -159,6 +159,8 @@
         <if test="sortNo != null "> and oo.sort_no = #{sortNo}</if>
         <if test="createUserCode != null  and createUserCode != ''"> and oo.create_user_code = #{createUserCode}</if>
         <if test="updateUserCode != null  and updateUserCode != ''"> and oo.update_user_code = #{updateUserCode}</if>
+        <!-- 按创建时间降序，订单状态升序排序（创建时间最新的在前，订单状态靠前展示） -->
+        order by oo.order_status asc,oo.create_time desc
     </select>
 
     <select id="selectOutboundOrdersById" parameterType="String" resultMap="OutboundOrdersOutboundOrderItemsResult">