✨ feat: 物料台账

klp-ui/src/api/wms/stockLog.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询库存流水列表
+export function listStockLog(query) {
+  return request({
+    url: '/klp/stockLog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存流水详细
+export function getStockLog(id) {
+  return request({
+    url: '/klp/stockLog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增库存流水
+export function addStockLog(data) {
+  return request({
+    url: '/klp/stockLog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存流水
+export function updateStockLog(data) {
+  return request({
+    url: '/klp/stockLog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存流水
+export function delStockLog(id) {
+  return request({
+    url: '/klp/stockLog/' + id,
+    method: 'delete'
+  })
+}

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -24,7 +24,6 @@
 </template>
 
 <script>
-import { listRawMaterial } from "@/api/wms/rawMaterial";
 import { mapGetters } from "vuex";
 
 export default {
@@ -49,7 +48,6 @@ export default {
     },
     selected(val) {
       this.$emit("input", val);
-      this.$emit("change", val);
     }
   },
   mounted() {

klp-ui/src/views/wms/ledger/index.vue

@@ -1,379 +1,269 @@
 <template>
   <div class="app-container">
-    <el-row>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form :form="queryParams" inline>
+      <el-form-item label="存储位置" prop="warehouseId">
-        <el-form-item prop="itemType" label="物料类型">
+        <WarehouseSelect v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位" clearable @change="getList" />
-          <el-select v-model="queryParams.itemType" placeholder="物料类型" clearable style="width: 150px"
+      </el-form-item>
-            @change="getList">
+      <el-form-item label="物料类型" prop="itemType">
-            <el-option v-for="(item, index) in dict.type.stock_item_type" :key="index" :label="item.label"
+        <el-select v-model="queryParams.itemType" placeholder="请选择物料类型" clearable>
-              :value="item.value" />
+          <el-option v-for="item in dict.type.stock_item_type" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-        <el-form-item>
+
+      <el-form-item label="物品信息" prop="itemId">
         <RawMaterialSelect v-if="queryParams.itemType == 'raw_material'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
             style="width: 300px" clearable @change="getList" />
-          <ProductSelect v-if="queryParams.itemType == 'product'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
+          <ProductSelect v-else-if="queryParams.itemType == 'product'" v-model="queryParams.itemId" :item-type="queryParams.itemType" placeholder="物料信息"
             style="width: 300px" clearable @change="getList" />
+          <el-input v-else disabled v-model="queryParams.itemId" placeholder="请先选择物料类型" :disabled="true" style="width: 100%;" />
+      </el-form-item>
+      <el-form-item label="变动时间" prop="changeTime">
+        <el-date-picker clearable
+          v-model="queryParams.changeTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际库存变动时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-        <el-button type="primary" @click="getList">查询</el-button>
     </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <!-- 明细表格 -->
+
-    <el-table v-loading="loading" :data="stockIoDetailList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="stockLogList" @selection-change="handleSelectionChange">
-      <el-table-column label="库区/库位" align="center" prop="warehouseName" />
+      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="源库区/库位" align="center" prop="fromWarehouseName" />
+      <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>
-      <el-table-column label="操作来源" align="center" prop="recordType" />
+      <el-table-column label="仓库/库区/库位ID" align="center" prop="warehouseId" />
-      <el-table-column label="物品类型" align="center" prop="itemType">
+      <el-table-column label="物品ID" align="center" prop="itemId" />
+      <el-table-column label="物品类型" align="center" prop="itemType" />
+      <el-table-column label="变动数量" align="center" prop="changeQty" />
+      <el-table-column label="变动后的库存数量" align="center" prop="afterQty" />
+      <el-table-column label="变动类型" align="center" prop="changeType" />
+      <el-table-column label="实际库存变动时间" align="center" prop="changeTime" width="180">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
+          <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="物品信息" align="center" prop="itemId">
-        <template slot-scope="scope">
-          <raw-material-info v-if="scope.row.itemType === ITEM_TYPE.RAW_MATERIAL" :material-id="scope.row.itemId" />
-          <product-info v-else-if="scope.row.itemType === ITEM_TYPE.PRODUCT" :product-id="scope.row.itemId" />
-          <span v-else>{{ scope.row.itemId }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="BOM" align="center">
-        <template slot-scope="scope">
-          <BomInfoMini :item-type="scope.row.itemType" :item-id="scope.row.itemId" />
-        </template>
-      </el-table-column>
-      <el-table-column label="数量" align="center" prop="quantity" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="批次号" align="center" prop="batchNo" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+        </template>
+      </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+
-      @pagination="getList" />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改库存流水对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="仓库/库区/库位ID" prop="warehouseId" disabled>
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库/库区/库位ID" disabled />
+        </el-form-item>
+        <el-form-item label="物品ID" prop="itemId" disabled>
+          <el-input v-model="form.itemId" placeholder="请输入物品ID" disabled />
+        </el-form-item>
+        <el-form-item label="变动数量" prop="changeQty" disabled>
+          <el-input v-model="form.changeQty" placeholder="请输入变动数量" disabled />
+        </el-form-item>
+        <el-form-item label="变动后的库存数量" prop="afterQty" disabled>
+          <el-input v-model="form.afterQty" placeholder="请输入变动后的库存数量" disabled />
+        </el-form-item>
+        <el-form-item label="实际库存变动时间" prop="changeTime" disabled>
+          <el-date-picker clearable
+            v-model="form.changeTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择实际库存变动时间" disabled>
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listStockIoDetail } from "@/api/wms/stockIoDetail";
+import { listStockLog, getStockLog, delStockLog, addStockLog, updateStockLog } from "@/api/wms/stockLog";
-import WarehouseSelect from '@/components/WarehouseSelect';
+import WarehouseSelect from '@/components/KLPService/WarehouseSelect/index.vue';
-import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect';
+import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect/index.vue';
-import ProductSelect from '@/components/KLPService/ProductSelect';
+import ProductSelect from '@/components/KLPService/ProductSelect/index.vue';
-import { ITEM_TYPE } from '@/utils/enums';
-import { RawMaterialInfo, ProductInfo } from "@/components/KLPService";
-import BomInfoMini from '@/components/KLPService/Renderer/BomInfoMini.vue';
 
 export default {
-  name: "StockIoDetailPanel",
+  name: "StockLog",
   components: {
     WarehouseSelect,
     RawMaterialSelect,
-    ProductSelect,
+    ProductSelect
-    RawMaterialInfo,
-    ProductInfo,
-    BomInfoMini
   },
   dicts: ['stock_item_type'],
   data() {
     return {
-      ITEM_TYPE,
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
       loading: true,
-      stockIoDetailList: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
       total: 0,
+      // 库存流水表格数据
+      stockLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        stockIoId: undefined
+        warehouseId: undefined,
+        itemId: undefined,
+        itemType: undefined,
+        changeQty: undefined,
+        afterQty: undefined,
+        changeType: undefined,
+        changeTime: undefined,
       },
-      auditLoading: false,
+      // 表单参数
-      open: false,
-      title: '',
       form: {},
-      buttonLoading: false,
+      // 表单校验
       rules: {
-        warehouseId: [
+      }
-          { required: true, message: "库区/库位不能为空", trigger: "blur" }
-        ],
-        itemType: [
-          { required: true, message: "物品类型不能为空", trigger: "blur" }
-        ],
-        itemId: [
-          { required: true, message: "物品ID不能为空", trigger: "blur" }
-        ],
-        quantity: [
-          { required: true, message: "数量不能为空", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "单位不能为空", trigger: "blur" }
-        ]
-      },
-      ids: [],
-      single: true,
-      multiple: true,
-      statusLoading: false, // 新增状态修改按钮加载状态
-      cancelLoading: false, // 撤回按钮加载状态
-      unitDisabled: false, // 新增：单位输入框是否禁用
-      activeTab: 'manual' // 新增：当前激活的标签页
     };
   },
-  mounted() {
+  created() {
     const itemId = this.$route.query.itemId;
     const itemType = this.$route.query.itemType;
+    if (itemId && itemType) {
       this.queryParams.itemId = itemId;
       this.queryParams.itemType = itemType;
+    }
     this.getList();
   },
   methods: {
+    /** 查询库存流水列表 */
     getList() {
       this.loading = true;
-      listStockIoDetail(this.queryParams).then(response => {
+      listStockLog(this.queryParams).then(response => {
-        this.stockIoDetailList = response.rows;
+        this.stockLogList = response.rows;
         this.total = response.total;
-      }).finally(() => {
         this.loading = false;
       });
     },
-    handleAudit() {
+    // 取消按钮
-      // 检查是否有明细数据
+    cancel() {
-      if (!this.stockIoDetailList || this.stockIoDetailList.length === 0) {
+      this.open = false;
-        this.$modal.msgError('请先添加明细数据');
+      this.reset();
-        return;
-      }
-
-      // 确认审核
-      this.$modal.confirm('确认要审核此出入库单吗？审核后将影响库存数据。').then(() => {
-        this.auditLoading = true;
-        auditStockIo(this.stockIo.stockIoId).then(response => {
-          this.$modal.msgSuccess('审核成功');
-          // 更新主表状态
-          this.$set(this.stockIo, 'status', 2);
-          // 刷新明细列表
-          this.getList();
-          // 通知父组件状态已更新
-          this.$emit('status-changed', this.stockIo);
-        }).catch(error => {
-          console.error('审核失败:', error);
-          this.$modal.msgError('审核失败：' + (error.message || '未知错误'));
-        }).finally(() => {
-          this.auditLoading = false;
-        });
-      }).catch(() => {
-        // 用户取消审核
-      });
     },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        warehouseId: undefined,
+        itemId: undefined,
+        itemType: undefined,
+        changeQty: undefined,
+        afterQty: undefined,
+        changeType: undefined,
+        changeTime: undefined,
+        remark: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.detailId)
+      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    handleAdd() {
+    /** 修改按钮操作 */
-      this.reset();
-      this.form.stockIoId = this.stockIo.stockIoId;
-      this.form.recordType = 0; // 新增时设为手动录入
-      this.open = true;
-      this.title = "添加出入库单明细";
-    },
     handleUpdate(row) {
       this.loading = true;
       this.reset();
-      const detailId = row.detailId || this.ids
+      const id = row.id || this.ids
-      getStockIoDetail(detailId).then(response => {
+      getStockLog(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        this.form.recordType = 0; // 修改时强制设为手动录入
         this.open = true;
-        this.title = "修改出入库单明细";
+        this.title = "修改库存流水";
       });
     },
+    /** 提交按钮 */
     submitForm() {
-      // 动态添加源库位验证规则
-      if (this.stockIo.ioType === 'transfer') {
-        this.$set(this.rules, 'fromWarehouseId', [
-          { required: true, message: "源库区/库位不能为空", trigger: "blur" }
-        ]);
-      } else {
-        this.$delete(this.rules, 'fromWarehouseId');
-      }
-
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          if (this.form.detailId != null) {
+          if (this.form.id != null) {
-            updateStockIoDetail(this.form).then(response => {
+            updateStockLog(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             }).finally(() => {
               this.buttonLoading = false;
             });
-          } else {
-            addStockIoDetail(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-              // 新增明细后刷新主表状态
-              this.refreshStockIoStatus();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
           }
         }
       });
     },
-    handleDelete(row) {
+    /** 导出按钮操作 */
-      const detailIds = row.detailId || this.ids;
-      this.$modal.confirm('是否确认删除出入库单明细编号为"' + detailIds + '"的数据项？').then(() => {
-        this.loading = true;
-        return delStockIoDetail(detailIds);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-        // 删除明细后刷新主表状态
-        this.refreshStockIoStatus();
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    reset() {
-      this.form = {
-        detailId: undefined,
-        stockIoId: undefined,
-        warehouseId: undefined,
-        fromWarehouseId: undefined,
-        itemType: undefined,
-        itemId: undefined,
-        quantity: undefined,
-        unit: undefined,
-        batchNo: undefined,
-        remark: undefined
-      };
-      this.unitDisabled = false; // 新增：重置单位输入框为可编辑
-      this.resetForm("form");
-    },
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     handleExport() {
-      this.download('wms/stockIoDetail/export', {
+      this.download('klp/stockLog/export', {
         ...this.queryParams
-      }, `stockIoDetail_${new Date().getTime()}.xlsx`)
+      }, `stockLog_${new Date().getTime()}.xlsx`)
-    },
-    getAuditButtonText() {
-      if (this.stockIo.ioType === 'in') {
-        return '审核入库';
-      } else if (this.stockIo.ioType === 'out') {
-        return '审核出库';
-      } else if (this.stockIo.ioType === 'transfer') {
-        return '审核移库';
-      } else {
-        return '审核';
-      }
-    },
-    getStatusButtonText() {
-      if (this.stockIo.ioType === 'in') {
-        return '提交入库';
-      } else if (this.stockIo.ioType === 'out') {
-        return '提交出库';
-      } else if (this.stockIo.ioType === 'transfer') {
-        return '提交移库';
-      } else {
-        return '提交';
-      }
-    },
-    handleUpdateStatus() {
-      // 检查是否有明细数据
-      if (!this.stockIoDetailList || this.stockIoDetailList.length === 0) {
-        this.$modal.msgError('请先添加明细数据');
-        return;
-      }
-
-      this.$modal.confirm('确认要提交此出入库单吗？提交后将无法修改明细。').then(() => {
-        this.statusLoading = true;
-        updateStockIoStatus(this.stockIo.stockIoId, 1).then(response => {
-          this.$modal.msgSuccess('状态更新成功');
-          // 更新主表状态
-          this.$set(this.stockIo, 'status', 1);
-          // 通知父组件状态已更新
-          this.$emit('status-changed', this.stockIo);
-        }).catch(error => {
-          console.error('状态更新失败:', error);
-          this.$modal.msgError('状态更新失败：' + (error.message || '未知错误'));
-        }).finally(() => {
-          this.statusLoading = false;
-        });
-      }).catch(() => {
-        // 用户取消状态更新
-      });
-    },
-    handleCancel() {
-      this.$modal.confirm('确认要撤回此出入库单吗？撤回后将回滚库存数据。').then(() => {
-        this.cancelLoading = true;
-        cancelStockIo(this.stockIo.stockIoId).then(response => {
-          this.$modal.msgSuccess('撤回成功');
-          // 更新主表状态
-          this.$set(this.stockIo, 'status', 1);
-          // 刷新明细列表
-          this.getList();
-          // 通知父组件状态已更新
-          this.$emit('status-changed', this.stockIo);
-        }).catch(error => {
-          console.error('撤回失败:', error);
-          this.$modal.msgError('撤回失败：' + (error.message || '未知错误'));
-        }).finally(() => {
-          this.cancelLoading = false;
-        });
-      }).catch(() => {
-        // 用户取消撤回
-      });
-    },
-    refreshStockIoStatus() {
-      // 刷新主表状态
-      if (this.stockIo && this.stockIo.stockIoId) {
-        getStockIo(this.stockIo.stockIoId).then(response => {
-          const updatedStockIo = response.data;
-          // 更新主表状态
-          this.$set(this.stockIo, 'status', updatedStockIo.status);
-          // 通知父组件状态已更新
-          this.$emit('status-changed', this.stockIo);
-        }).catch(error => {
-          console.error('刷新主表状态失败:', error);
-        });
-      }
-    },
-    getIoTypeTagType(type) {
-      if (type === 'in') return 'success';
-      if (type === 'out') return 'primary';
-      if (type === 'transfer') return 'warning';
-      return '';
-    },
-    getIoTypeLabel(type) {
-      if (type === 'in') return '入库';
-      if (type === 'out') return '出库';
-      if (type === 'transfer') return '移库';
-      return type;
-    },
-    getBizTypeLabel(type) {
-      const map = {
-        purchase: '采购',
-        sales: '销售',
-        return: '退货',
-        relocation: '调拨',
-        other: '其他'
-      };
-      return map[type] || type;
-    },
-    getBizTypeTagType(type) {
-      if (type === 'purchase') return 'success';
-      if (type === 'sales') return 'primary';
-      if (type === 'return') return 'warning';
-      if (type === 'relocation') return 'info';
-      return 'default';
-    },
-    onItemChange(e) {
-      if (e && e.unit) {
-        this.form.unit = e.unit;
-        this.unitDisabled = true;
     }
   }
-  }
+};
-}
 </script>

klp-ui/src/views/wms/stock/index.vue

@@ -76,7 +76,7 @@
         <el-table-column label="库存数量" align="center" prop="quantity" />
         <el-table-column label="在途数量" align="center" prop="onTheWay" />
         <el-table-column label="单位" align="center" prop="unit" />
-        <el-table-column label="批次号" align="center" prop="batchNo" />
+        <!-- <el-table-column label="批次号" align="center" prop="batchNo" /> -->
         <el-table-column label="备注" align="center" prop="remark" />
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">