From 084ab842a7288f10a44c06f84955d4151223da7e Mon Sep 17 00:00:00 2001
From: kkk-ops <1050738955@qq.com>
Date: Mon, 5 Jan 2026 18:58:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/plan/index.ts | 4 +
src/api/mes/zjproduct/index.ts | 95 ++++++-------
src/utils/dict.ts | 1 +
src/views/mes/plan/index.vue | 127 +++++++++++++-----
.../zjproduct/components/ZjProductList.vue | 1 -
.../zjproduct/components/ZjProductPreList.vue | 79 +++++++++++
6 files changed, 227 insertions(+), 80 deletions(-)
create mode 100644 src/views/mes/zjproduct/components/ZjProductPreList.vue
diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 7ddf759a..5478fd5f 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -80,4 +80,8 @@ export const PlanApi = {
getStartPlanProduct: async (orgType) => {
return await request.get({ url: `/mes/app/org-worker/getPlanProductList?orgType=`+orgType })
},
+ // 更新质检状态生产计划
+ updatePlanZjStatus: async (data: PlanVO) => {
+ return await request.put({ url: `/mes/plan/updatePlanZjStatus`, data })
+ },
}
diff --git a/src/api/mes/zjproduct/index.ts b/src/api/mes/zjproduct/index.ts
index e928986a..bb4a2d51 100644
--- a/src/api/mes/zjproduct/index.ts
+++ b/src/api/mes/zjproduct/index.ts
@@ -1,45 +1,50 @@
-import request from '@/config/axios'
-
-// 质量管理-质检参数 VO
-export interface ZjProductVO {
- id: number // ID
- type: string // 工序
- name: string // 名称
- unit: string // 单位
- upperVal: number // 上限值
- lowerVal: number // 下限值
- remark: string // 备注
-}
-
-// 质量管理-质检参数 API
-export const ZjProductApi = {
- // 查询质量管理-质检参数分页
- getZjProductPage: async (params: any) => {
- return await request.get({ url: `/mes/zj-product/page`, params })
- },
-
- // 查询质量管理-质检参数详情
- getZjProduct: async (id: number) => {
- return await request.get({ url: `/mes/zj-product/get?id=` + id })
- },
-
- // 新增质量管理-质检参数
- createZjProduct: async (data: ZjProductVO) => {
- return await request.post({ url: `/mes/zj-product/create`, data })
- },
-
- // 修改质量管理-质检参数
- updateZjProduct: async (data: ZjProductVO) => {
- return await request.put({ url: `/mes/zj-product/update`, data })
- },
-
- // 删除质量管理-质检参数
- deleteZjProduct: async (id: number) => {
- return await request.delete({ url: `/mes/zj-product/delete?id=` + id })
- },
-
- // 导出质量管理-质检参数 Excel
- exportZjProduct: async (params) => {
- return await request.download({ url: `/mes/zj-product/export-excel`, params })
- },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 质量管理-质检参数 VO
+export interface ZjProductVO {
+ id: number // ID
+ type: string // 工序
+ name: string // 名称
+ unit: string // 单位
+ upperVal: number // 上限值
+ lowerVal: number // 下限值
+ remark: string // 备注
+}
+
+// 质量管理-质检参数 API
+export const ZjProductApi = {
+ // 查询质量管理-质检参数分页
+ getZjProductPage: async (params: any) => {
+ return await request.get({ url: `/mes/zj-product/page`, params })
+ },
+
+ // 查询质量管理-质检参数详情
+ getZjProduct: async (id: number) => {
+ return await request.get({ url: `/mes/zj-product/get?id=` + id })
+ },
+
+ // 新增质量管理-质检参数
+ createZjProduct: async (data: ZjProductVO) => {
+ return await request.post({ url: `/mes/zj-product/create`, data })
+ },
+
+ // 修改质量管理-质检参数
+ updateZjProduct: async (data: ZjProductVO) => {
+ return await request.put({ url: `/mes/zj-product/update`, data })
+ },
+
+ // 删除质量管理-质检参数
+ deleteZjProduct: async (id: number) => {
+ return await request.delete({ url: `/mes/zj-product/delete?id=` + id })
+ },
+
+ // 导出质量管理-质检参数 Excel
+ exportZjProduct: async (params) => {
+ return await request.download({ url: `/mes/zj-product/export-excel`, params })
+ },
+
+ // 获得产品质检参数明细列表
+ getZjProductByProductId: async (productId) => {
+ return await request.get({ url: `/mes/zj-product/list-by-item-product-id?productId=` + productId })
+ }
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 124e0578..051535cc 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -255,6 +255,7 @@ export enum DICT_TYPE {
MES_MANTAIN_LEVEL = "mes_mantain_level",
MOLD_GET_STATUS = "mold_get_status",
MES_PRE_PRODUCTION = "mes_pre_production",
+ MES_ZJ_PRODUCT = "mes_zj_product",
//====iot
IOT_SIEMENS_TYPE = "iot_siemens_type",
IOT_MODBUS_TYPE = "iot_modbus_type",
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index d4965f6d..e77599e3 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -117,53 +117,58 @@
-
-
+
-
+
-
-
+
+
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
- 开工
+ 试产
+
+
+ 检验
+
+
+ 量产
+ 报工
+
+
@@ -222,18 +253,27 @@
完工
+
+ 入库
+
删除
@@ -262,7 +302,7 @@
\ No newline at end of file
From 14891f8ddb5f04e086e133ceaac0cee5e21f7593 Mon Sep 17 00:00:00 2001
From: kkk-ops <1050738955@qq.com>
Date: Tue, 6 Jan 2026 15:13:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/plan/index.ts | 4 ++++
src/locales/zh-CN.ts | 4 ++--
.../mes/feedingrecord/FeedingRecordForm.vue | 23 +++++++++++++++++--
.../components/FeedingRecordDetailForm.vue | 8 +++----
src/views/mes/itemrequisition/index.vue | 18 +++++++++++----
src/views/mes/plan/index.vue | 19 +++++++++++----
6 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 5478fd5f..9225484f 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -84,4 +84,8 @@ export const PlanApi = {
updatePlanZjStatus: async (data: PlanVO) => {
return await request.put({ url: `/mes/plan/updatePlanZjStatus`, data })
},
+ // 根据状态查询生产计划详情
+ getPlanByStatus: async (status: number) => {
+ return await request.get({ url: `/mes/plan/getByStatus?status=` + status })
+ },
}
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 271cdf04..3bc473da 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -114,8 +114,8 @@ export default {
small: '小'
},
login: {
- welcome: '欢迎使用本系统',
- message: '开箱即用的中后台管理系统',
+ welcome: '欢迎使用必硕生产运营管理系统',
+ message: '必硕智能“纸”为绿色生活',
tenantname: '租户名称',
username: '用户名',
password: '密码',
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index bdab575f..64af09e4 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -10,7 +10,7 @@
-
+
+
+
+
+
+
@@ -91,6 +107,8 @@ import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
import { defaultProps, handleTree } from '@/utils/tree'
+import {PlanApi, PlanVO} from "@/api/mes/plan";
+const planList = ref([]) // 列表
/** 投料记录 表单 */
defineOptions({ name: 'FeedingRecordForm' })
@@ -148,6 +166,7 @@ const open = async (type: string, id?: number) => {
productList.value = await ProductApi.getMesProductSimpleList()
// 加载组织
await getOrganizationTree()
+ planList.value = await PlanApi.getPlanByStatus(1)
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
index 0a9db05a..f431e608 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -55,18 +55,18 @@
-
+
-
+