From 0935a2a74fb551499edd3193352a8fff6f1fd9ec Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Fri, 10 May 2024 17:06:13 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=83=98=E6=88=BF?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/kanban/dryingprocess.js | 26 +
src/views/kanban/Dryingprocess/index.vue | 1051 ++++++++++++++++++----
src/views/kanban/exceptionnew/index.vue | 1 +
3 files changed, 912 insertions(+), 166 deletions(-)
create mode 100644 src/api/kanban/dryingprocess.js
diff --git a/src/api/kanban/dryingprocess.js b/src/api/kanban/dryingprocess.js
new file mode 100644
index 00000000..23c0fdb4
--- /dev/null
+++ b/src/api/kanban/dryingprocess.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// /**烘房生产监控看板--当天烘房情况**/
+export function getHEProInfo(data) {
+ return request({
+ url: '/mes/mesborad/getHFProInfo',
+ method: 'post',
+ data: data
+ });
+}
+///**烘房生产监控看板--当天质量情况**/
+export function getHFQcInfo(data) {
+ return request({
+ url: '/mes/mesborad/getHFQcInfo',
+ method: 'post',
+ data: data
+ });
+}
+// /**烘房生产监控看板--效率分析**/
+export function getHFxlInfo(data) {
+ return request({
+ url: '/mes/mesborad/getHFxlInfo',
+ method: 'post',
+ data: data
+ });
+}
diff --git a/src/views/kanban/Dryingprocess/index.vue b/src/views/kanban/Dryingprocess/index.vue
index b4a03ce6..a7e8cc13 100644
--- a/src/views/kanban/Dryingprocess/index.vue
+++ b/src/views/kanban/Dryingprocess/index.vue
@@ -13,37 +13,165 @@
当天烘房情况
-
+
-
+
+
+
+
+
+ {{ card.equCode }}
+
+
+ {{ card.totalNum }}
+
+
+ {{ card.unitPro }}
+
+
+
-
-
@@ -52,30 +180,46 @@
当天质量情况
-
+
-
-
-
烘房
-
产量
-
标准产能
+
+
+
+
+ {{ card.equCode }}
+
+
+ {{ card.rfid }}
+
+
+ {{ card.taskNum || "0" }}
+
@@ -83,7 +227,19 @@
@@ -94,20 +250,17 @@
+
+
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 19e25a00..c0b12b93 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -66,6 +66,17 @@
v-hasPermi="['system:notice:remove']"
>删除
+
+ 班组绑定
+
@@ -125,56 +136,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dict.label}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
From a9820f6ed293516482c00c9929070be526b99665 Mon Sep 17 00:00:00 2001
From: A0010407
Date: Wed, 15 May 2024 16:00:46 +0800
Subject: [PATCH 8/9] =?UTF-8?q?2024-05-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E4=BF=AE=E6=94=B9=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/product.js | 9 ++
src/views/wms/product/index.vue | 250 +++++++++++++++++++++-----------
2 files changed, 175 insertions(+), 84 deletions(-)
diff --git a/src/api/wms/product.js b/src/api/wms/product.js
index 9a8a974d..f580eb96 100644
--- a/src/api/wms/product.js
+++ b/src/api/wms/product.js
@@ -55,3 +55,12 @@ export function delProduct(productId) {
method: 'delete'
});
}
+
+// 修改物料信息
+export function updateProductAttached(data) {
+ return request({
+ url: '/wms/attached',
+ method: 'put',
+ data: data
+ });
+}
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 5b00c479..a8fa9e8b 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -62,6 +62,18 @@
>修改
+
+ 修改附属属性
+
同步物料工艺
+ >同步物料工艺
@@ -420,93 +432,120 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{
- form.productCode
- }}
- {{
- form.productDescZh
- }}
-
- {{
- form.productGroup
- }}
- {{
- form.productGroupName
- }}
- {{
- form.mtart
- }}
- {{
- form.reportRate
- }}
- {{
- form.category
- }}
- {{
- form.pc
- }}
- {{
- form.iei
- }}
- {{
- form.manStandar
- }}
- {{
- form.sprayWay
- }}
- {{
- form.blankDiameter
- }}
- {{
- form.blankNo
- }}
- {{
- form.sprayVolume
- }}
- {{
- form.liquidNo
- }}
- {{
- form.endometrialDosage
- }}
- {{
- form.outerFilmDosage
- }}
- {{
- form.support
- }}
- {{
- form.supportNo
- }}
- {{
- form.pvc
- }}
- {{
- form.supportPlate
- }}
- {{
- form.other
- }}
-
+ {{
+ form.productGroup
+ }}
+ {{
+ form.productGroupName
+ }}
+ {{
+ form.mtart
+ }}
+ {{
+ form.reportRate
+ }}
+ {{
+ form.category
+ }}
+ {{
+ form.pc
+ }}
+ {{
+ form.iei
+ }}
+ {{
+ form.manStandar
+ }}
+ {{
+ form.sprayWay
+ }}
+ {{
+ form.blankDiameter
+ }}
+ {{
+ form.blankNo
+ }}
+ {{
+ form.sprayVolume
+ }}
+ {{
+ form.liquidNo
+ }}
+ {{
+ form.endometrialDosage
+ }}
+ {{
+ form.outerFilmDosage
+ }}
+ {{
+ form.support
+ }}
+ {{
+ form.supportNo
+ }}
+ {{
+ form.pvc
+ }}
+ {{
+ form.supportPlate
+ }}
+ {{
+ form.other
+ }}
+
@@ -519,6 +558,7 @@ import {
delProduct,
addProduct,
updateProduct,
+ updateProductAttached,
} from "@/api/wms/product";
import { syncProductSAP } from "@/api/technology/proroute";
@@ -537,7 +577,7 @@ export default {
loading: true,
// 选中数组
ids: [],
- productCodes:[],
+ productCodes: [],
// 非单个禁用
single: true,
// 非多个禁用
@@ -552,6 +592,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ openAttachedView: false,
openAttached: false,
// 查询参数
queryParams: {
@@ -637,14 +678,22 @@ export default {
this.open = false;
this.reset();
},
- // 取消按钮
- cancelAttached() {
+ // 查看取消按钮
+ cancelAttachedView() {
+ this.openAttachedView = false;
+ this.reset();
+ },
+ // 更新附属表取消按钮
+ cancelOpenAttached() {
this.openAttached = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
+ id: null,
+ iei: null,
+ manStandar: null,
productId: null,
productCode: null,
productDescZh: null,
@@ -704,7 +753,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.productId);
- this.productCodes = selection.map(item => item.productCode)
+ this.productCodes = selection.map((item) => item.productCode);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -724,16 +773,18 @@ export default {
this.title = "修改产品信息";
});
},
+
// 查询明细按钮操作
handleView(row) {
this.reset();
const productId = row.productId || this.ids;
getProduct(productId).then((response) => {
this.form = response.data;
- this.openAttached = true;
+ this.openAttachedView = true;
this.title = "查看产品信息";
});
},
+
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
@@ -754,6 +805,37 @@ export default {
}
});
},
+
+ /** 修改按钮操作 */
+ handleUpdateAttached(row) {
+ this.reset();
+ const productId = row.productId || this.ids;
+ getProduct(productId).then((response) => {
+ this.form.id = response.data.id;
+ this.form.iei = response.data.iei;
+ this.form.manStandar = response.data.manStandar;
+ this.openAttached = true;
+ this.title = "查看产品信息";
+ });
+ },
+
+ /** 提交按钮 */
+ submitAttachedForm() {
+ this.$refs["form"].validate((valid) => {
+ console.log(this.form);
+ if (valid) {
+ if (this.form.id != null) {
+ console.log(this.form);
+ updateProductAttached(this.form).then((response) => {
+ this.$modal.msgSuccess("修改产品附属信息成功");
+ this.openAttached = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+
/** 删除按钮操作 */
handleDelete(row) {
const productIds = row.productId || this.ids;
@@ -781,10 +863,10 @@ export default {
);
},
/**选择产品进行工艺同步**/
- handleSyncProductSAP(){
+ handleSyncProductSAP() {
const productCodes = this.productCodes;
return syncProductSAP(productCodes);
- }
+ },
},
};
From 7dc7fa23a6339a138942c59c656dfe5e51b5e8f3 Mon Sep 17 00:00:00 2001
From: A0010407
Date: Wed, 15 May 2024 17:08:57 +0800
Subject: [PATCH 9/9] =?UTF-8?q?2024-05-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E4=BF=AE=E6=94=B9=E4=BA=A7?=
=?UTF-8?q?=E5=93=81=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A72?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/product.js | 11 ++++++++++-
src/views/wms/product/index.vue | 17 +++++++++++++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/api/wms/product.js b/src/api/wms/product.js
index f580eb96..fb3c99bd 100644
--- a/src/api/wms/product.js
+++ b/src/api/wms/product.js
@@ -56,7 +56,7 @@ export function delProduct(productId) {
});
}
-// 修改物料信息
+// 修改物料附属信息
export function updateProductAttached(data) {
return request({
url: '/wms/attached',
@@ -64,3 +64,12 @@ export function updateProductAttached(data) {
data: data
});
}
+
+// 新增物料附属信息
+export function addProductAttached(data) {
+ return request({
+ url: '/wms/attached',
+ method: 'post',
+ data: data
+ });
+}
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index a8fa9e8b..839c3377 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -71,7 +71,7 @@
:disabled="single"
@click="handleUpdateAttached"
v-hasPermi="['wms:attached:edit']"
- >修改附属属性新增/修改附属属性
@@ -559,6 +559,7 @@ import {
addProduct,
updateProduct,
updateProductAttached,
+ addProductAttached,
} from "@/api/wms/product";
import { syncProductSAP } from "@/api/technology/proroute";
@@ -814,8 +815,14 @@ export default {
this.form.id = response.data.id;
this.form.iei = response.data.iei;
this.form.manStandar = response.data.manStandar;
+ this.form.productCode = response.data.productCode.slice(7,18);
+ console.log(this.form.productCode);
this.openAttached = true;
- this.title = "查看产品信息";
+ if(this.form.id == null){
+ this.title = "新增产品附属信息";
+ }else{
+ this.title = "修改产品附属信息";
+ }
});
},
@@ -831,6 +838,12 @@ export default {
this.openAttached = false;
this.getList();
});
+ }else {
+ addProductAttached(this.form).then((response) => {
+ this.$modal.msgSuccess("新增产品附属信息成功");
+ this.openAttached = false;
+ this.getList();
+ });
}
}
});