From 58bdd266dca1f01672706b040d3df26582389301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 18 Jul 2025 17:22:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/api/wms/purchasePlan.js            |  44 +++
 klp-ui/src/api/wms/purchasePlanDetail.js      |  44 +++
 .../KLPService/RawMaterialSelect/index.vue    |  57 ++++
 klp-ui/src/views/wms/order/index.vue          |  27 +-
 klp-ui/src/views/wms/productBom/index.vue     |  24 +-
 klp-ui/src/views/wms/purchasePlan/index.vue   | 306 ++++++++++++++++++
 .../views/wms/purchasePlan/panels/clac.vue    | 118 +++++++
 .../views/wms/purchasePlan/panels/detail.vue  | 287 ++++++++++++++++
 klp-ui/src/views/wms/rawMaterial/index.vue    |  30 +-
 klp-ui/src/views/wms/stock/index.vue          | 103 +++++-
 10 files changed, 995 insertions(+), 45 deletions(-)
 create mode 100644 klp-ui/src/api/wms/purchasePlan.js
 create mode 100644 klp-ui/src/api/wms/purchasePlanDetail.js
 create mode 100644 klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
 create mode 100644 klp-ui/src/views/wms/purchasePlan/index.vue
 create mode 100644 klp-ui/src/views/wms/purchasePlan/panels/clac.vue
 create mode 100644 klp-ui/src/views/wms/purchasePlan/panels/detail.vue

diff --git a/klp-ui/src/api/wms/purchasePlan.js b/klp-ui/src/api/wms/purchasePlan.js
new file mode 100644
index 00000000..8b6322de
--- /dev/null
+++ b/klp-ui/src/api/wms/purchasePlan.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询采购计划主列表
+export function listPurchasePlan(query) {
+  return request({
+    url: '/wms/purchasePlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采购计划主详细
+export function getPurchasePlan(planId) {
+  return request({
+    url: '/wms/purchasePlan/' + planId,
+    method: 'get'
+  })
+}
+
+// 新增采购计划主
+export function addPurchasePlan(data) {
+  return request({
+    url: '/wms/purchasePlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采购计划主
+export function updatePurchasePlan(data) {
+  return request({
+    url: '/wms/purchasePlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采购计划主
+export function delPurchasePlan(planId) {
+  return request({
+    url: '/wms/purchasePlan/' + planId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/api/wms/purchasePlanDetail.js b/klp-ui/src/api/wms/purchasePlanDetail.js
new file mode 100644
index 00000000..99ccf24d
--- /dev/null
+++ b/klp-ui/src/api/wms/purchasePlanDetail.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询采购计划明细列表
+export function listPurchasePlanDetail(query) {
+  return request({
+    url: '/wms/purchasePlanDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采购计划明细详细
+export function getPurchasePlanDetail(detailId) {
+  return request({
+    url: '/wms/purchasePlanDetail/' + detailId,
+    method: 'get'
+  })
+}
+
+// 新增采购计划明细
+export function addPurchasePlanDetail(data) {
+  return request({
+    url: '/wms/purchasePlanDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采购计划明细
+export function updatePurchasePlanDetail(data) {
+  return request({
+    url: '/wms/purchasePlanDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采购计划明细
+export function delPurchasePlanDetail(detailId) {
+  return request({
+    url: '/wms/purchasePlanDetail/' + detailId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
new file mode 100644
index 00000000..291f1d74
--- /dev/null
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <el-select
+    v-model="selected"
+    :placeholder="placeholder"
+    filterable
+    clearable
+    @change="onChange"
+    style="width: 100%"
+  >
+    <el-option
+      v-for="item in options"
+      :key="item.rawMaterialId"
+      :label="item.rawMaterialName"
+      :value="item.rawMaterialId"
+    />
+  </el-select>
+</template>
+
+<script>
+import { listRawMaterial } from "@/api/wms/rawMaterial";
+
+export default {
+  name: "RawMaterialSelect",
+  props: {
+    value: [String, Number],
+    placeholder: {
+      type: String,
+      default: "请选择原材料"
+    }
+  },
+  data() {
+    return {
+      options: [],
+      selected: this.value
+    };
+  },
+  watch: {
+    value(val) {
+      this.selected = val;
+    }
+  },
+  mounted() {
+    this.fetchOptions();
+  },
+  methods: {
+    fetchOptions() {
+      listRawMaterial({ pageNum: 1, pageSize: 1000 }).then(res => {
+        this.options = res.rows || [];
+      });
+    },
+    onChange(val) {
+      this.$emit("input", val);
+      this.$emit("change", val);
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/order/index.vue b/klp-ui/src/views/wms/order/index.vue
index 698fa0a3..538046ee 100644
--- a/klp-ui/src/views/wms/order/index.vue
+++ b/klp-ui/src/views/wms/order/index.vue
@@ -83,7 +83,11 @@
       <el-table-column label="订单编号" align="center" prop="orderCode" />
       <el-table-column label="客户名称" align="center" prop="customerName" />
       <el-table-column label="销售经理" align="center" prop="salesManager" />
-      <el-table-column label="订单状态" align="center" prop="orderStatus" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -107,6 +111,12 @@
             icon="el-icon-document"
             @click="showDetail(scope.row)"
           >明细</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-operation"
+            @click="showClac(scope.row)"
+          >智能采购单</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -145,16 +155,23 @@
     <el-dialog title="订单明细" :visible.sync="detailDialogVisible" width="900px" append-to-body>
       <OrderDetailPanel :orderId="detailOrderId" />
     </el-dialog>
+
+    <!-- 智能采购单弹窗 -->
+    <el-dialog :title="`智能采购单（订单ID：${clacOrderId}）`" :visible.sync="clacDialogVisible" width="90%" append-to-body>
+      <clac-panel :orderId="clacOrderId" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/wms/order";
 import OrderDetailPanel from './panels/detail.vue';
+import ClacPanel from '../purchasePlan/panels/clac.vue';
 
 export default {
   name: "Order",
-  components: { OrderDetailPanel },
+  components: { OrderDetailPanel, ClacPanel },
+  dict: ['order_status'],
   data() {
     return {
       // 按钮loading
@@ -193,6 +210,8 @@ export default {
       },
       detailDialogVisible: false,
       detailOrderId: null,
+      clacDialogVisible: false,
+      clacOrderId: null,
     };
   },
   created() {
@@ -314,6 +333,10 @@ export default {
       this.detailOrderId = row.orderId;
       this.detailDialogVisible = true;
     },
+    showClac(row) {
+      this.clacOrderId = row.orderId;
+      this.clacDialogVisible = true;
+    },
   }
 };
 </script>
diff --git a/klp-ui/src/views/wms/productBom/index.vue b/klp-ui/src/views/wms/productBom/index.vue
index 9cc6e854..d537ee53 100644
--- a/klp-ui/src/views/wms/productBom/index.vue
+++ b/klp-ui/src/views/wms/productBom/index.vue
@@ -2,20 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="产品ID" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入产品ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <ProductSelect v-model="queryParams.productId" placeholder="请选择产品" />
       </el-form-item>
       <el-form-item label="原材料ID" prop="rawMaterialId">
-        <el-input
-          v-model="queryParams.rawMaterialId"
-          placeholder="请输入原材料ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <RawMaterialSelect v-model="queryParams.rawMaterialId" placeholder="请选择原材料" />
       </el-form-item>
       <el-form-item label="每个产品所需原材料数量" prop="quantity">
         <el-input
@@ -125,10 +115,10 @@
     <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="productId">
-          <el-input v-model="form.productId" placeholder="请输入产品ID" />
+          <ProductSelect v-model="form.productId" placeholder="请选择产品" />
         </el-form-item>
         <el-form-item label="原材料ID" prop="rawMaterialId">
-          <el-input v-model="form.rawMaterialId" placeholder="请输入原材料ID" />
+          <RawMaterialSelect v-model="form.rawMaterialId" placeholder="请选择原材料" />
         </el-form-item>
         <el-form-item label="每个产品所需原材料数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入每个产品所需原材料数量" />
@@ -150,9 +140,15 @@
 
 <script>
 import { listProductBom, getProductBom, delProductBom, addProductBom, updateProductBom } from "@/api/wms/productBom";
+import ProductSelect from "@/components/KLPService/ProductSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 
 export default {
   name: "ProductBom",
+  components: {
+    ProductSelect,
+    RawMaterialSelect
+  },
   data() {
     return {
       // 按钮loading
diff --git a/klp-ui/src/views/wms/purchasePlan/index.vue b/klp-ui/src/views/wms/purchasePlan/index.vue
new file mode 100644
index 00000000..3c794830
--- /dev/null
+++ b/klp-ui/src/views/wms/purchasePlan/index.vue
@@ -0,0 +1,306 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="采购计划编号" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入采购计划编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="owner">
+        <el-input
+          v-model="queryParams.owner"
+          placeholder="请输入负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="关联订单ID" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入关联订单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <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="purchasePlanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="采购计划ID" align="center" prop="planId" v-if="true"/>
+      <el-table-column label="采购计划编号" align="center" prop="planCode" />
+      <el-table-column label="负责人" align="center" prop="owner" />
+      <el-table-column label="关联订单ID" align="center" prop="orderId" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <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>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(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"
+    />
+
+    <!-- 添加或修改采购计划主对话框 -->
+    <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="采购计划编号" prop="planCode">
+          <el-input v-model="form.planCode" placeholder="请输入采购计划编号" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="owner">
+          <el-input v-model="form.owner" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="关联订单ID" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入关联订单ID" />
+        </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 { listPurchasePlan, getPurchasePlan, delPurchasePlan, addPurchasePlan, updatePurchasePlan } from "@/api/wms/purchasePlan";
+
+export default {
+  name: "PurchasePlan",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采购计划主表格数据
+      purchasePlanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planCode: undefined,
+        owner: undefined,
+        orderId: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        planCode: [
+          { required: true, message: "采购计划编号不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+        orderId: [
+          { required: true, message: "关联订单ID不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询采购计划主列表 */
+    getList() {
+      this.loading = true;
+      listPurchasePlan(this.queryParams).then(response => {
+        this.purchasePlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        planId: undefined,
+        planCode: undefined,
+        owner: undefined,
+        orderId: undefined,
+        status: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: 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.planId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加采购计划主";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const planId = row.planId || this.ids
+      getPurchasePlan(planId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改采购计划主";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.planId != null) {
+            updatePurchasePlan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addPurchasePlan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const planIds = row.planId || this.ids;
+      this.$modal.confirm('是否确认删除采购计划主编号为"' + planIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delPurchasePlan(planIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('klp/purchasePlan/export', {
+        ...this.queryParams
+      }, `purchasePlan_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/purchasePlan/panels/clac.vue b/klp-ui/src/views/wms/purchasePlan/panels/clac.vue
new file mode 100644
index 00000000..c355f377
--- /dev/null
+++ b/klp-ui/src/views/wms/purchasePlan/panels/clac.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <el-form :inline="true" @submit.native.prevent>
+      <el-form-item>
+        <el-button type="success" @click="addRow">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData" style="width: 100%; margin-top: 20px" border>
+      <el-table-column prop="raw_material_id" label="原材料ID" width="120">
+        <template #default="scope">
+          <el-input v-model="scope.row.raw_material_id" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="owner" label="负责人" width="120">
+        <template #default="scope">
+          <el-input v-model="scope.row.owner" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="quantity" label="计划采购数" width="120">
+        <template #default="scope">
+          <el-input-number v-model="scope.row.quantity" :min="0" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="unit" label="单位" width="100">
+        <template #default="scope">
+          <el-input v-model="scope.row.unit" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" width="180">
+        <template #default="scope">
+          <el-input v-model="scope.row.remark" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="100">
+        <template #default="scope">
+          <el-button type="danger" size="small" @click="removeRow(scope.$index)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="margin-top: 20px; text-align: right;">
+      <el-button type="primary" @click="confirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PurchasePlanClac',
+  props: {
+    orderId: {
+      type: [String, Number],
+      required: true
+    }
+  },
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  watch: {
+    orderId: {
+      immediate: true,
+      handler(newVal) {
+        this.loadData(newVal)
+      }
+    }
+  },
+  methods: {
+    loadData(orderId) {
+      // 模拟接口返回数据，根据orderId加载不同数据
+      // 实际开发中可根据orderId请求后端接口
+      if (!orderId) {
+        this.tableData = []
+        return
+      }
+      this.tableData = [
+        {
+          raw_material_id: 1,
+          owner: '张三',
+          quantity: 100,
+          unit: 'kg',
+          remark: '紧急采购'
+        },
+        {
+          raw_material_id: 2,
+          owner: '李四',
+          quantity: 50,
+          unit: '件',
+          remark: ''
+        }
+      ]
+    },
+    addRow() {
+      this.tableData.push({
+        raw_material_id: '',
+        owner: '',
+        quantity: 0,
+        unit: '',
+        remark: ''
+      })
+    },
+    removeRow(index) {
+      this.tableData.splice(index, 1)
+    },
+    confirm() {
+      this.$message.success('操作已确认');
+      console.log(this.tableData);
+      this.$emit('confirm', this.tableData);
+    }
+  }
+}
+</script>
+
+<style scoped>
+.el-form {
+  margin-bottom: 20px;
+}
+</style>
diff --git a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
new file mode 100644
index 00000000..b34bb522
--- /dev/null
+++ b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <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="purchasePlanDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="明细ID" align="center" prop="detailId" v-if="true"/>
+      <el-table-column label="采购计划ID" align="center" prop="planId" />
+      <el-table-column label="原材料ID" align="center" prop="rawMaterialId" />
+      <el-table-column label="负责人" align="center" prop="owner" />
+      <el-table-column label="计划采购数量" align="center" prop="quantity" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <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>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(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"
+    />
+
+    <!-- 添加或修改采购计划明细对话框 -->
+    <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="planId">
+          <el-input v-model="form.planId" placeholder="请输入采购计划ID" />
+        </el-form-item>
+        <el-form-item label="原材料ID" prop="rawMaterialId">
+          <el-input v-model="form.rawMaterialId" placeholder="请输入原材料ID" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="owner">
+          <el-input v-model="form.owner" placeholder="请输入负责人" />
+        </el-form-item>
+        <el-form-item label="计划采购数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入计划采购数量" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </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 { listPurchasePlanDetail, getPurchasePlanDetail, delPurchasePlanDetail, addPurchasePlanDetail, updatePurchasePlanDetail } from "@/api/wms/purchasePlanDetail";
+
+export default {
+  name: "PurchasePlanDetail",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采购计划明细表格数据
+      purchasePlanDetailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planId: undefined,
+        rawMaterialId: undefined,
+        owner: undefined,
+        quantity: undefined,
+        unit: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        planId: [
+          { required: true, message: "采购计划ID不能为空", trigger: "blur" }
+        ],
+        rawMaterialId: [
+          { required: true, message: "原材料ID不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+        quantity: [
+          { required: true, message: "计划采购数量不能为空", trigger: "blur" }
+        ],
+        unit: [
+          { required: true, message: "单位不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询采购计划明细列表 */
+    getList() {
+      this.loading = true;
+      listPurchasePlanDetail(this.queryParams).then(response => {
+        this.purchasePlanDetailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        detailId: undefined,
+        planId: undefined,
+        rawMaterialId: undefined,
+        owner: undefined,
+        quantity: undefined,
+        unit: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createTime: undefined,
+        createBy: undefined,
+        updateTime: undefined,
+        updateBy: 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.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加采购计划明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const detailId = row.detailId || this.ids
+      getPurchasePlanDetail(detailId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改采购计划明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.detailId != null) {
+            updatePurchasePlanDetail(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addPurchasePlanDetail(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const detailIds = row.detailId || this.ids;
+      this.$modal.confirm('是否确认删除采购计划明细编号为"' + detailIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delPurchasePlanDetail(detailIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('klp/purchasePlanDetail/export', {
+        ...this.queryParams
+      }, `purchasePlanDetail_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index 5ae17ac8..dbef49ba 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -33,20 +33,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基础材质分类ID" prop="baseMaterialId">
-        <el-input
+      <el-form-item label="基础材质分类" prop="baseMaterialId">
+        <CategorySelect
           v-model="queryParams.baseMaterialId"
-          placeholder="请输入基础材质分类ID"
+          placeholder="请选择基础材质分类"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="表面处理分类ID" prop="surfaceTreatmentId">
-        <el-input
+      <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+        <CategorySelect
           v-model="queryParams.surfaceTreatmentId"
-          placeholder="请输入表面处理分类ID"
+          placeholder="请选择表面处理分类"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="厚度" prop="thickness">
@@ -233,11 +231,11 @@
         <el-form-item label="目标冷轧牌号" prop="targetColdGrade">
           <el-input v-model="form.targetColdGrade" placeholder="请输入目标冷轧牌号" />
         </el-form-item>
-        <el-form-item label="基础材质分类ID" prop="baseMaterialId">
-          <el-input v-model="form.baseMaterialId" placeholder="请输入基础材质分类ID" />
+        <el-form-item label="基础材质分类" prop="baseMaterialId">
+          <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
         </el-form-item>
-        <el-form-item label="表面处理分类ID" prop="surfaceTreatmentId">
-          <el-input v-model="form.surfaceTreatmentId" placeholder="请输入表面处理分类ID" />
+        <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+          <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
         </el-form-item>
         <el-form-item label="厚度" prop="thickness">
           <el-input v-model="form.thickness" placeholder="请输入厚度" />
@@ -283,9 +281,13 @@
 
 <script>
 import { listRawMaterial, getRawMaterial, delRawMaterial, addRawMaterial, updateRawMaterial } from "@/api/wms/rawMaterial";
+import CategorySelect from "@/components/KLPService/CategorySelect/index.vue";
 
 export default {
   name: "RawMaterial",
+  components: {
+    CategorySelect
+  },
   data() {
     return {
       // 按钮loading
@@ -352,10 +354,10 @@ export default {
           { required: true, message: "目标冷轧牌号不能为空", trigger: "blur" }
         ],
         baseMaterialId: [
-          { required: true, message: "基础材质分类ID不能为空", trigger: "blur" }
+          { required: true, message: "基础材质分类不能为空", trigger: "blur" }
         ],
         surfaceTreatmentId: [
-          { required: true, message: "表面处理分类ID不能为空", trigger: "blur" }
+          { required: true, message: "表面处理分类不能为空", trigger: "blur" }
         ],
         thickness: [
           { required: true, message: "厚度不能为空", trigger: "blur" }
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index ed1687c4..52941852 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -2,19 +2,44 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库/库区/库位ID" prop="warehouseId">
-        <el-input
+        <warehouse-select
           v-model="queryParams.warehouseId"
-          placeholder="请输入仓库/库区/库位ID"
+          placeholder="请选择仓库/库区/库位"
+          style="width: 100%;"
           clearable
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物品类型" prop="itemType">
+        <el-select v-model="queryParams.itemType" placeholder="请选择物品类型" clearable>
+          <el-option
+            v-for="dict in dict.type.stock_item_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="物品ID" prop="itemId">
-        <el-input
+        <raw-material-select
+          v-if="queryParams.itemType === 'rawMaterial'"
           v-model="queryParams.itemId"
-          placeholder="请输入物品ID"
+          placeholder="请选择原材料"
+          style="width: 100%;"
           clearable
-          @keyup.enter.native="handleQuery"
+        />
+        <product-select
+          v-else-if="queryParams.itemType === 'product'"
+          v-model="queryParams.itemId"
+          placeholder="请选择产品"
+          style="width: 100%;"
+          clearable
+        />
+        <el-input
+          v-else
+          v-model="queryParams.itemId"
+          placeholder="请先选择物品类型"
+          :disabled="true"
+          style="width: 100%;"
         />
       </el-form-item>
       <el-form-item label="库存数量" prop="quantity">
@@ -55,7 +80,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['klp:stock:add']"
+          v-hasPermi="['wms:stock:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -66,7 +91,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['klp:stock:edit']"
+          v-hasPermi="['wms:stock:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +102,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['klp:stock:remove']"
+          v-hasPermi="['wms:stock:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,7 +112,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['klp:stock:export']"
+          v-hasPermi="['wms:stock:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -97,7 +122,11 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="stockId" v-if="true"/>
       <el-table-column label="仓库/库区/库位ID" align="center" prop="warehouseId" />
-      <el-table-column label="物品类型" align="center" prop="itemType" />
+      <el-table-column label="物品类型" align="center" prop="itemType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="物品ID" align="center" prop="itemId" />
       <el-table-column label="库存数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
@@ -110,14 +139,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['klp:stock:edit']"
+            v-hasPermi="['wms:stock:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['klp:stock:remove']"
+            v-hasPermi="['wms:stock:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -135,10 +164,45 @@
     <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">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库/库区/库位ID" />
+          <warehouse-select
+            v-model="form.warehouseId"
+            placeholder="请选择仓库/库区/库位"
+            style="width: 100%;"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="物品类型" prop="itemType">
+          <el-select v-model="form.itemType" placeholder="请选择物品类型">
+            <el-option
+              v-for="dict in dict.type.stock_item_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="物品ID" prop="itemId">
-          <el-input v-model="form.itemId" placeholder="请输入物品ID" />
+          <raw-material-select
+            v-if="form.itemType === 'rawMaterial'"
+            v-model="form.itemId"
+            placeholder="请选择原材料"
+            style="width: 100%;"
+            clearable
+          />
+          <product-select
+            v-else-if="form.itemType === 'product'"
+            v-model="form.itemId"
+            placeholder="请选择产品"
+            style="width: 100%;"
+            clearable
+          />
+          <el-input
+            v-else
+            v-model="form.itemId"
+            placeholder="请先选择物品类型"
+            :disabled="true"
+            style="width: 100%;"
+          />
         </el-form-item>
         <el-form-item label="库存数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入库存数量" />
@@ -163,9 +227,18 @@
 
 <script>
 import { listStock, getStock, delStock, addStock, updateStock } from "@/api/wms/stock";
+import WarehouseSelect from "@/components/WarehouseSelect";
+import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import ProductSelect from "@/components/KLPService/ProductSelect";
 
 export default {
   name: "Stock",
+  dicts: ['stock_item_type'],
+  components: {
+    WarehouseSelect,
+    RawMaterialSelect,
+    ProductSelect
+  },
   data() {
     return {
       // 按钮loading

From 043b0e8b79378410dc7e22c41c4dada9dc7c2e04 Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Fri, 18 Jul 2025 17:23:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=AE=A2=E5=8D=95=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WmsPurchasePlanController.java | 10 +++-
 .../com/klp/domain/vo/WmsPurchasePlanVo.java  |  6 ++
 .../com/klp/mapper/WmsProductBomMapper.java   |  3 +
 .../java/com/klp/mapper/WmsStockMapper.java   |  3 +
 .../klp/service/IWmsProductBomService.java    |  5 ++
 .../klp/service/IWmsPurchasePlanService.java  |  5 ++
 .../com/klp/service/IWmsStockService.java     |  6 ++
 .../impl/WmsProductBomServiceImpl.java        |  5 ++
 .../impl/WmsPurchasePlanServiceImpl.java      | 55 ++++++++++++++++++-
 .../klp/service/impl/WmsStockServiceImpl.java |  6 ++
 .../mapper/klp/WmsProductBomMapper.xml        |  7 +++
 .../resources/mapper/klp/WmsStockMapper.xml   |  5 ++
 12 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
index 63c5c7d7..565e5df2 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
@@ -6,7 +6,6 @@ import java.util.Arrays;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.klp.common.annotation.RepeatSubmit;
@@ -37,6 +36,15 @@ public class WmsPurchasePlanController extends BaseController {
 
     private final IWmsPurchasePlanService iWmsPurchasePlanService;
 
+    /**
+     * 根据订单ID生成推荐采购计划（只返回，不落库）
+     */
+    @GetMapping("/recommend/{orderId}")
+    public R<WmsPurchasePlanVo> recommendPurchasePlan(@PathVariable Long orderId) {
+        WmsPurchasePlanVo planVo = iWmsPurchasePlanService.recommendPurchasePlanByOrder(orderId);
+        return R.ok(planVo);
+    }
+
     /**
      * 查询采购计划主列表
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanVo.java
index 8d8fb798..b3d4db2a 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanVo.java
@@ -6,6 +6,8 @@ import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 采购计划主视图对象 wms_purchase_plan
@@ -56,5 +58,9 @@ public class WmsPurchasePlanVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 采购计划明细列表
+     */
+    private List<WmsPurchasePlanDetailVo> detailList;
 
 }
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java
index 0e1d9d3b..aeedcd3c 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsProductBomMapper.java
@@ -4,6 +4,8 @@ import com.klp.domain.WmsProductBom;
 import com.klp.domain.vo.WmsProductBomVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 产品BOM（产品-原材料清单）Mapper接口
  *
@@ -12,4 +14,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsProductBomMapper extends BaseMapperPlus<WmsProductBomMapper, WmsProductBom, WmsProductBomVo> {
 
+    List<WmsProductBom> listByProductId(Long productId);
 }
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java
index 21a82dc8..c1e0fb66 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java
@@ -4,6 +4,8 @@ import com.klp.domain.WmsStock;
 import com.klp.domain.vo.WmsStockVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
 
+import java.math.BigDecimal;
+
 /**
  * 库存：原材料/产品与库区/库位的存放关系Mapper接口
  *
@@ -12,4 +14,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsStockMapper extends BaseMapperPlus<WmsStockMapper, WmsStock, WmsStockVo> {
 
+    BigDecimal getStockByItemId(Long rawMaterialId);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProductBomService.java b/klp-wms/src/main/java/com/klp/service/IWmsProductBomService.java
index 297fb924..0b0f06d1 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsProductBomService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsProductBomService.java
@@ -46,4 +46,9 @@ public interface IWmsProductBomService {
      * 校验并批量删除产品BOM（产品-原材料清单）信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据产品ID查询产品BOM（产品-原材料清单）列表
+     */
+    List<WmsProductBom> listByProductId(Long productId);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsPurchasePlanService.java b/klp-wms/src/main/java/com/klp/service/IWmsPurchasePlanService.java
index 5e1a5e6e..886f0f8b 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsPurchasePlanService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsPurchasePlanService.java
@@ -17,6 +17,11 @@ import java.util.List;
  */
 public interface IWmsPurchasePlanService {
 
+    /**
+     * 根据订单ID生成推荐采购计划（只返回，不落库）
+     */
+    WmsPurchasePlanVo recommendPurchasePlanByOrder(Long orderId);
+
     /**
      * 查询采购计划主
      */
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsStockService.java b/klp-wms/src/main/java/com/klp/service/IWmsStockService.java
index 4fb5b33a..2c3d8958 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsStockService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsStockService.java
@@ -6,6 +6,7 @@ import com.klp.domain.bo.WmsStockBo;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.List;
 
@@ -46,4 +47,9 @@ public interface IWmsStockService {
      * 校验并批量删除库存：原材料/产品与库区/库位的存放关系信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据原材料ID获取库存数量 (用于生成推荐采购计划)
+     */
+    BigDecimal getStockByItemId(Long rawMaterialId);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
index df2ebb6e..818c573e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductBomServiceImpl.java
@@ -109,4 +109,9 @@ public class WmsProductBomServiceImpl implements IWmsProductBomService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public List<WmsProductBom> listByProductId(Long productId) {
+        return baseMapper.listByProductId(productId);
+    }
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanServiceImpl.java
index cfb18069..ac973913 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsPurchasePlanServiceImpl.java
@@ -7,6 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.domain.WmsOrderDetail;
+import com.klp.domain.WmsProductBom;
+import com.klp.domain.vo.WmsOrderDetailVo;
+import com.klp.domain.vo.WmsPurchasePlanDetailVo;
+import com.klp.service.IWmsOrderDetailService;
+import com.klp.service.IWmsProductBomService;
+import com.klp.service.IWmsStockService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.domain.bo.WmsPurchasePlanBo;
@@ -15,9 +22,8 @@ import com.klp.domain.WmsPurchasePlan;
 import com.klp.mapper.WmsPurchasePlanMapper;
 import com.klp.service.IWmsPurchasePlanService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 采购计划主Service业务层处理
@@ -31,6 +37,49 @@ public class WmsPurchasePlanServiceImpl implements IWmsPurchasePlanService {
 
     private final WmsPurchasePlanMapper baseMapper;
 
+    private final IWmsOrderDetailService wmsOrderDetailService;
+
+    private final IWmsProductBomService wmsProductBomService;
+
+    private final IWmsStockService wmsStockService;
+
+    @Override
+    public WmsPurchasePlanVo recommendPurchasePlanByOrder(Long orderId) {
+        // 1. 查询订单明细
+        List<WmsOrderDetailVo> orderDetails = wmsOrderDetailService.queryListByOrderId(orderId);
+        // 2. 汇总原材料需求
+        Map<Long, WmsPurchasePlanDetailVo> materialMap = new HashMap<>();
+        for (WmsOrderDetailVo detail : orderDetails) {
+            List<WmsProductBom> bomList = wmsProductBomService.listByProductId(detail.getProductId());
+            for (WmsProductBom bom : bomList) {
+                BigDecimal needQty = bom.getQuantity().multiply(detail.getQuantity());
+                WmsPurchasePlanDetailVo vo = materialMap.getOrDefault(bom.getRawMaterialId(), new WmsPurchasePlanDetailVo());
+                vo.setRawMaterialId(bom.getRawMaterialId());
+                vo.setQuantity(vo.getQuantity() == null ? needQty : vo.getQuantity().add(needQty));
+                vo.setUnit(bom.getUnit());
+                materialMap.put(bom.getRawMaterialId(), vo);
+            }
+        }
+        // 3. 查询库存并计算推荐采购量
+        for (WmsPurchasePlanDetailVo vo : materialMap.values()) {
+            BigDecimal stockQty = wmsStockService.getStockByItemId(vo.getRawMaterialId());
+            // 要是物料不是产品
+            BigDecimal recommendQty = BigDecimal.ZERO;
+            if (stockQty != null) {
+                recommendQty = vo.getQuantity().subtract(stockQty);
+            }
+            vo.setQuantity(recommendQty.compareTo(BigDecimal.ZERO) > 0 ? recommendQty : BigDecimal.ZERO);
+        }
+        // 4. 组装主VO
+        WmsPurchasePlanVo planVo = new WmsPurchasePlanVo();
+        planVo.setPlanCode("推荐计划-" + orderId);
+        planVo.setOrderId(orderId);
+        planVo.setOwner("系统推荐");
+        planVo.setRemark("仅供参考，实际采购请确认");
+        planVo.setDetailList(new ArrayList<>(materialMap.values()));
+        return planVo;
+    }
+
     /**
      * 查询采购计划主
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
index bfc65042..0a3894c0 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
@@ -15,6 +15,7 @@ import com.klp.domain.WmsStock;
 import com.klp.mapper.WmsStockMapper;
 import com.klp.service.IWmsStockService;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -111,4 +112,9 @@ public class WmsStockServiceImpl implements IWmsStockService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public BigDecimal getStockByItemId(Long rawMaterialId) {
+        return baseMapper.getStockByItemId(rawMaterialId);
+    }
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml
index b03879b7..7d8acf59 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsProductBomMapper.xml
@@ -13,5 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
+    <select id="listByProductId" resultType="com.klp.domain.WmsProductBom">
+        SELECT bom_id, product_id, raw_material_id, quantity, unit, remark
+        FROM wms_product_bom
+        WHERE product_id = #{productId}
+        and del_flag = 0
+    </select>
+
 
 </mapper>
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
index 8b527016..a1f0443d 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
@@ -20,5 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
     </resultMap>
 
+    <select id="getStockByItemId" resultType="java.math.BigDecimal">
+        select sum(quantity) as quantity from wms_stock
+        where item_id = #{rawMaterialId} and item_type = 'raw_material' and del_flag = 0
+    </select>
+
 
 </mapper>