批量入库添加入库日期

入库库位组件调整

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

@@ -80,7 +80,7 @@
             readonly
             @focus="openLocationSelector"
             :suffix-icon="''"
-            :disabled="!queryParams.warehouseId"
+           
           >
             <template v-if="queryLocationName" #suffix>
               <i
@@ -114,10 +114,10 @@
         >
           <el-table-column label="物料SAPNO" align="center" prop="sapNo" width="200"/>
           <el-table-column label="物料名称" align="center" prop="materialName" width="200"/>
-          <el-table-column label="关联入库单ID" align="center" prop="orderId" :show-overflow-tooltip="true" width="200"/>
-          <el-table-column label="批次ID" align="center" prop="batchId" :show-overflow-tooltip="true" width="200"/>
-          <el-table-column label="所在仓库" align="center" prop="warehousesName" width="200"/>
-          <el-table-column label="库位ID" align="center" prop="locationName" width="200"/>
+          <el-table-column label="关联入库单" align="center" prop="orderId" :show-overflow-tooltip="true" width="200"/>
+          <el-table-column label="批次号" align="center" prop="batchId" :show-overflow-tooltip="true" width="200"/>
+          <el-table-column label="源仓库" align="center" prop="warehousesName" width="200"/>
+          <el-table-column label="库位" align="center" prop="locationName" width="200"/>
           <el-table-column label="入库数量" align="center" prop="actualQuantity" width="200"/>
           <el-table-column label="件数" align="center" prop="actualPackages" width="200"/>
           <el-table-column label="单价" align="center" prop="unitPrice" width="200"/>
@@ -159,7 +159,7 @@
       <!-- 库位选择组件 -->
       <LocationSelector
         v-model="locationSelectorVisible"
-        :warehousesId="queryParams.warehouseId"
+        
         @selected="handleLocationSelected"
       />
     </div>
@@ -303,10 +303,10 @@ export default {
 
     /** 打开库位选择器 */
     openLocationSelector() {
-      if (!this.queryParams.warehouseId) {
-        this.$message.warning("请先选择仓库")
-        return
-      }
+      // if (!this.queryParams.warehouseId) {
+      //   this.$message.warning("请先选择仓库")
+      //   return
+      // }
       this.locationSelectorVisible = true
     },
 

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

@@ -461,7 +461,6 @@
       <!-- 库位选择组件 -->
       <LocationSelector
         v-model="locationSelectorVisible"
-        :warehousesId="currentEditRowWarehousesId"
         @selected="handleLocationSelected"
       />
     </div>
@@ -813,7 +812,7 @@ export default {
       // 打开库位选择器
     openLocationSelector(row) {
       this.currentEditRow = row
-      this.currentEditRowWarehousesId = row.warehouseId // 传递仓库ID给库位选择器
+      // this.currentEditRowWarehousesId = row.warehouseId // 传递仓库ID给库位选择器
       this.locationSelectorVisible = true
     },
     // 库位选择回调

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

@@ -157,7 +157,7 @@
                   v-model="scope.row.warehousesName"
                   size="small"
                   readonly
-                  placeholder="请选择仓库"
+                  placeholder="请选择源仓库"
                   @focus="$emit('open-warehouse-selector', scope.row)"
                   :suffix-icon="''"
                 >
@@ -179,7 +179,6 @@
                   placeholder="请选择库位"
                   @focus="$emit('open-location-selector', scope.row)"
                   :suffix-icon="''"
-                  :disabled="!scope.row.warehouseId"
                 >
                   <template v-if="scope.row.locationName" #suffix>
                     <i
@@ -343,7 +342,7 @@ export default {
         { prop: 'materialName', label: '货物名称', width: '150', editable: false },
         {
           prop: 'warehousesName',
-          label: '仓库',
+          label: '源仓库',
           width: '150',
           editable: true,
           idProp: 'warehouseId'
@@ -498,8 +497,6 @@ export default {
       if (!inboundOrderId) return
       this.loading = true
       this.queryParams.inboundOrderId = inboundOrderId
-      // 重置分页页码，避免切换入库单时使用之前的分页位置
-      this.queryParams.pageNum = 1
       listInbound_itemsAndMname(this.queryParams).then(response => {
         this.displayData = response.rows.map(item => ({
           ...item,

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/InboundOrdersServiceImpl.java

@@ -316,6 +316,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                             "plannedPackages", "materialUnit", "materialRemark"); // 排除子表字段
                     // 填充主表必填字段
                     mainDO.setId(UUID.randomUUID().toString());
+                    mainDO.setInboundDate(now);
                     mainDO.setOrderId(orderId);
                     mainDO.setCreateBy(operId);
                     mainDO.setCreateTime(now);