✨ feat: 生产管理

2025-08-26 16:51:23 +08:00
parent 666c42a128
commit 503b30ced5
13 changed files with 838 additions and 466 deletions
--- a/klp-ui/src/views/work/task/components/OrderSelect.vue
+++ b/klp-ui/src/views/work/task/components/OrderSelect.vue
@@ -41,6 +41,7 @@ export default {
      loading: false,
      queryParams: {
        orderCode: undefined,
+        orderStatus: 1,
        pageNum: 1,
        pageSize: 20
      },
--- a/klp-ui/src/views/work/task/index.vue
+++ b/klp-ui/src/views/work/task/index.vue
@@ -100,14 +100,22 @@

    <el-table v-loading="loading" :data="productionTaskList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="taskId" v-if="true"/>
-      <el-table-column label="产品规范组ID" align="center" prop="productSpecGroupId" />
-      <el-table-column label="制造规范ID" align="center" prop="manufacturingSpecId" />
-      <el-table-column label="订单ID" align="center" prop="orderId" />
-      <el-table-column label="订单明细ID" align="center" prop="orderItemId" />
+      <el-table-column label="主键" align="center" prop="taskId" v-if="false" />
+      <!-- <el-table-column label="产品规范组ID" align="center" prop="productSpecGroupId" /> -->
+      <el-table-column label="产品规范组" align="center" prop="productSpecGroup.groupName" />
+      <el-table-column label="产品规范名" align="center" prop="productSpecGroup.groupCode" />
+      <el-table-column label="工艺步骤" align="center" prop="manufacturingSpec.processRoute" />
+      <el-table-column label="制造规范名" align="center" prop="manufacturingSpec.specName" />
+      <el-table-column label="制造规范编号" align="center" prop="manufacturingSpec.specCode" />
+      <el-table-column label="订单编号" align="center" prop="orderCode" />
+      <el-table-column label="生产产品" align="center">
+        <template slot-scope="scope">
+          <ProductInfo :productId="scope.row.productId" />
+        </template>
+      </el-table-column>
      <el-table-column label="计划名称" align="center" prop="planName" />
      <el-table-column label="计划编号" align="center" prop="planCode" />
-      <el-table-column label="状态" align="center" prop="status" />
+      <!-- <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">
@@ -139,10 +147,10 @@
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="产品规范组" prop="productSpecGroupId">
-          <el-input v-model="form.productSpecGroupId" placeholder="请输入产品规范组" />
+          <PSpecSelect v-model="form.productSpecGroupId" />
        </el-form-item>
        <el-form-item label="制造规范" prop="manufacturingSpecId">
-          <el-input v-model="form.manufacturingSpecId" placeholder="请输入制造规范" />
+          <MSpecSelect v-model="form.manufacturingSpecId" />
        </el-form-item>
        <!-- <el-form-item label="订单" prop="orderId">
          <el-input v-model="form.orderId" placeholder="请输入订单" />
@@ -175,11 +183,17 @@
 <script>
 import { listProductionTask, getProductionTask, delProductionTask, addProductionTask, updateProductionTask } from "@/api/work/productionTask";
 import CreateByOrder from "./panels/createByOrder.vue";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import MSpecSelect from "../components/MSpecSelect.vue";
+import PSpecSelect from "../components/PSpecSelect.vue";

 export default {
  name: "ProductionTask",
  components: {
-    CreateByOrder
+    CreateByOrder,
+    ProductInfo,
+    MSpecSelect,
+    PSpecSelect
  },
  data() {
    return {
@@ -353,15 +367,35 @@ export default {
    },
    handleConfirmCreate(orderItems) {
      console.log(orderItems);
-      Promise.all(orderItems.map(item => {
-        return addProductionTask({
-          productSpecGroupId: item.productSpecGroupId,
-          manufacturingSpecIds: item.manufacturingSpecIds,
-          orderId: item.orderId,
-          orderItemId: item.orderItemId,
-        });
+      const params = [];
+      const orderId = orderItems[0].orderId;
+      
+      for (const item of orderItems) {
+        if (item.groupId == undefined) {
+          continue;
+        }
+        for (const manufacturingSpecId of item.manufacturingSpecIds) {
+          params.push({
+            productSpecGroupId: item.groupId,
+            manufacturingSpecId: manufacturingSpecId,
+            orderId: item.orderId,
+            orderItemId: item.detailId,
+            planName: '生产任务' + item.detailId,
+            planCode: 'PT' + item.detailId,
+          })
+        }
+      }
+      Promise.all(params.map(item => {
+        return addProductionTask(item);
      })).then(res => {
        this.$modal.msgSuccess("创建成功");
+        // 是否将订单状态设置为生产中？
+        this.$modal.confirm('是否将订单状态设置为生产中？').then(() => {
+          updateOrder({
+            orderId,
+            orderStatus: 2
+          });
+        });
        this.detailDialogVisible = false;
        this.getList();
      });
--- a/klp-ui/src/views/work/task/panels/createByOrder.vue
+++ b/klp-ui/src/views/work/task/panels/createByOrder.vue
@@ -22,7 +22,9 @@
      </el-table-column>
      <el-table-column label="制造规格">
        <template slot-scope="scope">
-          <MSpecSelect v-model="scope.row.manufacturingSpecIds" />
+          <el-select v-model="scope.row.manufacturingSpecIds" placeholder="请选择制造规格" multiple>
+            <el-option v-for="item in manufacturingSpecList" :key="item.specId" :label="item.specName" :value="item.specId" />
+          </el-select>
        </template>
      </el-table-column>
    </el-table>
@@ -30,7 +32,12 @@
    <el-dialog title="产品规范" :visible.sync="specDialogVisible" width="600px" append-to-body>
      <ProductSpec v-if="form.groupId" :groupId="form.groupId" :readonly="false"/>
      <div v-else>
-        暂无产品规格
+        <el-select placeholder="请选择产品规范" @change="handleChangeSpec" style="width: 100%;">
+          <el-option v-for="item in productSpecList.filter(item => item.productId != this.form.productId)" :key="item.groupId" :label="item.groupName" :value="item.groupId" />
+          <template #empty>
+            <el-button type="primary" @click="handleAddSpec">新增产品规范</el-button>
+          </template>
+        </el-select>
      </div>
    </el-dialog>
  </div>
@@ -38,11 +45,14 @@

 <script>
 import OrderSelect from "../components/OrderSelect";
-import { listOrderDetail } from "@/api/wms/orderDetail";
+import { listOrderDetail, updateOrderDetail } from "@/api/wms/orderDetail";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import MSpecSelect from "@/views/work/components/MSpecSelect";
 import ProductSpec from "@/views/wms/order/panels/spec.vue";

+import { listManufacturingSpec } from "@/api/work/manufacturingSpec";
+import { listProductSpecGroup } from "@/api/work/productSpecGroup";
+
 export default {
  name: 'CreateByOrder',
  components: {
@@ -51,6 +61,14 @@ export default {
    MSpecSelect,
    ProductSpec
  },
+  created() {
+    listManufacturingSpec().then(res => {
+      this.manufacturingSpecList = res.rows;
+    })
+    listProductSpecGroup().then(response => {
+      this.productSpecList = response.rows;
+    });
+  },
  data() {
    return {
      order: null,
@@ -58,7 +76,9 @@ export default {
      specDialogVisible: false,
      form: {
        groupId: undefined
-      }
+      },
+      manufacturingSpecList: [],
+      productSpecList: [],
    }
  },
  methods: {
@@ -72,11 +92,39 @@ export default {
    },
    handleCreate() {
      console.log(this.orderItems);
+      if (this.orderItems.length === 0) {
+        this.$message.error('请选择订单');
+        return;
+      }
+      for (const item of this.orderItems) {
+        if (item.groupId && item.manufacturingSpecIds.length === 0) {
+          this.$message.error('请选择制造规格');
+          return;
+        }
+      }
      this.$emit('create', this.orderItems);
    },
    handleSpec(row) {
      this.specDialogVisible = true;
      this.form = row;
+    },
+    handleChangeSpec(groupId) {
+      // 确认更换
+      this.$modal && this.$modal.confirm('是否确认更换产品规范？').then(() => {
+        this.form.groupId = groupId;
+        updateOrderDetail(this.form).then(response => {
+          this.$modal && this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      });
+    },
+    handleAddSpec() {
+      this.$router.push({
+        path: '/production/pspec',
+      });
    }
  }
 }