From b23999e5ee0e733d6175200268e9773f5b45b860 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Fri, 18 Jul 2025 10:30:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/api/wms/productionLine.js          |  44 +++
 klp-ui/src/views/wms/productionLine/index.vue | 339 ++++++++++++++++++
 klp-wms/src/main/java/com/klp/Main.java       |   7 -
 3 files changed, 383 insertions(+), 7 deletions(-)
 create mode 100644 klp-ui/src/api/wms/productionLine.js
 create mode 100644 klp-ui/src/views/wms/productionLine/index.vue
 delete mode 100644 klp-wms/src/main/java/com/klp/Main.java

diff --git a/klp-ui/src/api/wms/productionLine.js b/klp-ui/src/api/wms/productionLine.js
new file mode 100644
index 00000000..d9f954ea
--- /dev/null
+++ b/klp-ui/src/api/wms/productionLine.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询产线列表
+export function listProductionLine(query) {
+  return request({
+    url: '/wms/productionLine/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询产线详细
+export function getProductionLine(lineId) {
+  return request({
+    url: '/wms/productionLine/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增产线
+export function addProductionLine(data) {
+  return request({
+    url: '/wms/productionLine',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改产线
+export function updateProductionLine(data) {
+  return request({
+    url: '/wms/productionLine',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除产线
+export function delProductionLine(lineId) {
+  return request({
+    url: '/wms/productionLine/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/views/wms/productionLine/index.vue b/klp-ui/src/views/wms/productionLine/index.vue
new file mode 100644
index 00000000..8de65533
--- /dev/null
+++ b/klp-ui/src/views/wms/productionLine/index.vue
@@ -0,0 +1,339 @@
+<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="lineCode">
+        <el-input
+          v-model="queryParams.lineCode"
+          placeholder="请输入产线编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产线名称" prop="lineName">
+        <el-input
+          v-model="queryParams.lineName"
+          placeholder="请输入产线名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日产能" prop="capacity">
+        <el-input
+          v-model="queryParams.capacity"
+          placeholder="请输入日产能"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产能单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入产能单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-input
+          v-model="queryParams.isEnabled"
+          placeholder="请输入是否启用"
+          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"
+          v-hasPermi="['wms:productionLine:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:productionLine:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['wms:productionLine:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['wms:productionLine:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="productionLineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="产线ID" align="center" prop="lineId" v-if="true"/>
+      <el-table-column label="产线编号" align="center" prop="lineCode" />
+      <el-table-column label="产线名称" align="center" prop="lineName" />
+      <el-table-column label="日产能" align="center" prop="capacity" />
+      <el-table-column label="产能单位" align="center" prop="unit" />
+      <el-table-column label="是否启用" align="center" prop="isEnabled" />
+      <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)"
+            v-hasPermi="['wms:productionLine:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['wms:productionLine:remove']"
+          >删除</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="lineCode">
+          <el-input v-model="form.lineCode" placeholder="请输入产线编号" />
+        </el-form-item>
+        <el-form-item label="产线名称" prop="lineName">
+          <el-input v-model="form.lineName" placeholder="请输入产线名称" />
+        </el-form-item>
+        <el-form-item label="日产能" prop="capacity">
+          <el-input v-model="form.capacity" 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="isEnabled">
+          <el-input v-model="form.isEnabled" 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 { listProductionLine, getProductionLine, delProductionLine, addProductionLine, updateProductionLine } from "@/api/wms/productionLine";
+
+export default {
+  name: "ProductionLine",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 产线表格数据
+      productionLineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        lineCode: undefined,
+        lineName: undefined,
+        capacity: undefined,
+        unit: undefined,
+        isEnabled: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        lineCode: [
+          { required: true, message: "产线编号不能为空", trigger: "blur" }
+        ],
+        lineName: [
+          { required: true, message: "产线名称不能为空", trigger: "blur" }
+        ],
+        capacity: [
+          { required: true, message: "日产能不能为空", trigger: "blur" }
+        ],
+        unit: [
+          { required: true, message: "产能单位不能为空", trigger: "blur" }
+        ],
+        isEnabled: [
+          { required: true, message: "是否启用不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询产线列表 */
+    getList() {
+      this.loading = true;
+      listProductionLine(this.queryParams).then(response => {
+        this.productionLineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: undefined,
+        lineCode: undefined,
+        lineName: undefined,
+        capacity: undefined,
+        unit: undefined,
+        isEnabled: undefined,
+        remark: 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.lineId)
+      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 lineId = row.lineId || this.ids
+      getProductionLine(lineId).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.lineId != null) {
+            updateProductionLine(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addProductionLine(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lineIds = row.lineId || this.ids;
+      this.$modal.confirm('是否确认删除产线编号为"' + lineIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delProductionLine(lineIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/productionLine/export', {
+        ...this.queryParams
+      }, `productionLine_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/klp-wms/src/main/java/com/klp/Main.java b/klp-wms/src/main/java/com/klp/Main.java
deleted file mode 100644
index 37a082d1..00000000
--- a/klp-wms/src/main/java/com/klp/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.klp;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}
\ No newline at end of file

From 138eb967291857a6d6ac31fa613d3b4caa0405e5 Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Fri, 18 Jul 2025 11:16:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/productionLine/index.vue | 66 +++++++++++--------
 .../klp/domain/bo/WmsProductionLineBo.java    |  5 --
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/klp-ui/src/views/wms/productionLine/index.vue b/klp-ui/src/views/wms/productionLine/index.vue
index 59ea71de..a72db0eb 100644
--- a/klp-ui/src/views/wms/productionLine/index.vue
+++ b/klp-ui/src/views/wms/productionLine/index.vue
@@ -17,30 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="日产能" prop="capacity">
-        <el-input
-          v-model="queryParams.capacity"
-          placeholder="请输入日产能"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产能单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入产能单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否启用" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用"
-          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>
@@ -100,7 +77,18 @@
       <el-table-column label="产线名称" align="center" prop="lineName" />
       <el-table-column label="日产能" align="center" prop="capacity" />
       <el-table-column label="产能单位" align="center" prop="unit" />
-      <el-table-column label="是否启用" align="center" prop="isEnabled" />
+      <el-table-column label="是否启用" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isEnabled"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="启用"
+            inactive-text="禁用"
+            @change="handleEnabledChange(scope.row)"
+          />
+        </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">
@@ -146,7 +134,13 @@
           <el-input v-model="form.unit" placeholder="请输入产能单位" />
         </el-form-item>
         <el-form-item label="是否启用" prop="isEnabled">
-          <el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
+          <el-switch
+            v-model="form.isEnabled"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="启用"
+            inactive-text="禁用"
+          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -333,6 +327,26 @@ export default {
       this.download('klp/productionLine/export', {
         ...this.queryParams
       }, `productionLine_${new Date().getTime()}.xlsx`)
+    },
+    handleEnabledChange(row) {
+      // 只更新isEnabled字段
+      const updateData = {
+        lineId: row.lineId,
+        isEnabled: row.isEnabled
+      };
+      this.loading = true;
+      updateProductionLine(updateData)
+        .then(() => {
+          this.$modal.msgSuccess("状态更新成功");
+        })
+        .catch(() => {
+          this.$modal.msgError("状态更新失败");
+          // 回滚状态
+          row.isEnabled = row.isEnabled === 1 ? 0 : 1;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     }
   }
 };
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductionLineBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductionLineBo.java
index 87b968b0..58d26c7d 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductionLineBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductionLineBo.java
@@ -28,31 +28,26 @@ public class WmsProductionLineBo extends BaseEntity {
     /**
      * 产线编号
      */
-    @NotBlank(message = "产线编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String lineCode;
 
     /**
      * 产线名称
      */
-    @NotBlank(message = "产线名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String lineName;
 
     /**
      * 日产能（单位同产品）
      */
-    @NotNull(message = "日产能（单位同产品）不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal capacity;
 
     /**
      * 产能单位
      */
-    @NotBlank(message = "产能单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unit;
 
     /**
      * 是否启用（0=否，1=是）
      */
-    @NotNull(message = "是否启用（0=否，1=是）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer isEnabled;
 
     /**