Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms

ruoyi-admin-vue/src/views/inventory/inbound/details.vue

@@ -110,7 +110,7 @@
           height="100%"
           :data="inboundList"
           @selection-change="handleSelectionChange"
-          :row-key="(row) => row.materialId + '_' + row.orderId"
+          :row-key="(row) => row.materialId + '_' + row.orderId + '_' + row.warehousesName + '_' + row.locationName"
         >
           <el-table-column label="物料SAPNO" align="center" prop="sapNo" width="200"/>
           <el-table-column label="物料名称" align="center" prop="materialName" width="200"/>

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

@@ -179,7 +179,7 @@
           </el-table-column>
           <el-table-column label="入库时间" align="center" prop="inboundDate" width="200">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime,'{y}-{m}-{d}') }}</span>
+              <span>{{ parseTime(scope.row.inboundDate,'{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -401,6 +401,6 @@
         ioi.unit_price,
         ioi.remark,
         io.inbound_date
-        order by ioi.order_id asc,ioi.material_id asc
+        order by inbound_date desc,ioi.order_id asc,ioi.material_id asc
     </select>
 </mapper>
\ No newline at end of file