From 9ae0890dd74771ba9edd44d4830e0de37f8d9938 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 26 九月 2025 16:55:03 +0800
Subject: [PATCH] MES接口优化，老厂排程优化等
---
项目代码/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue | 85 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 44 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue"
similarity index 87%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue"
index 8504352..0d7740c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/outSGOrderDetail.vue"
@@ -3,7 +3,7 @@
<vol-box
v-model="showDetialBox"
:lazy="true"
- width="75%"
+ width="80%"
:padding="15"
title="鍗曟嵁鏄庣粏淇℃伅"
>
@@ -12,6 +12,8 @@
<el-row>
<el-col :span="16">
<span>宸查�変腑 {{ selection.length }} 椤�</span>
+ <el-divider direction="vertical"></el-divider>
+ <span>鍗曞彿 {{ row.orderId }} </span>
</el-col>
<el-col :span="8">
<!-- <el-link
@@ -103,10 +105,9 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
import VolForm from "@/components/basic/VolForm.vue";
-import StockSelect from "./StockSelect.vue";
import SelectedStock from "./SelectedStock.vue";
export default {
- components: { VolBox, VolForm, StockSelect, SelectedStock },
+ components: { VolBox, VolForm, SelectedStock },
data() {
return {
row: null,
@@ -124,17 +125,18 @@
hidden: true,
},
{
- prop: "outBSTOrderId",
+ prop: "outSGOrderId",
title: "鍑哄簱鍗曚富閿�",
- type: "string",
+ type: "int",
width: 90,
hidden: true,
},
{
- prop: "materialId",
- title: "涓婃父鐗╂枡ID",
- type: "string",
- width: 120,
+ prop: "鍏宠仈鐨勬槑缁咺D(涓婃父)",
+ title: "鍑哄簱鍗曞彿",
+ type: "int",
+ width: 90,
+ hidden: true,
},
{
prop: "materialNo",
@@ -143,11 +145,22 @@
width: 150,
},
{
- prop: "materielName",
+ prop: "materialName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 150,
- hidden: true,
+ },
+ {
+ prop: "boardFluteNo",
+ title: "妤炲埆",
+ type: "string",
+ width: 110,
+ },
+ {
+ prop: "machineName",
+ title: "鏈哄彴",
+ type: "string",
+ width: 110,
},
{
prop: "width",
@@ -180,7 +193,7 @@
width: 130,
},
{
- prop: "outBSTOrderDetailStatus",
+ prop: "outSGOrderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "tag",
width: 180,
@@ -206,12 +219,12 @@
type: "datetime",
width: 170,
},
- {
- prop: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 170,
- },
+ // {
+ // prop: "modifyDate",
+ // title: "淇敼鏃堕棿",
+ // type: "datetime",
+ // width: 170,
+ // },
],
paginations: {
sort: "id",
@@ -219,7 +232,7 @@
Foots: "",
total: 0,
// 2020.08.29澧炲姞鑷畾涔夊垎椤垫潯澶у皬
- sizes: [60, 100, 120],
+ sizes: [60],
size: 60, // 榛樿鍒嗛〉澶у皬
Wheres: [],
page: 1,
@@ -260,6 +273,7 @@
open(row) {
this.row = row;
this.showDetialBox = true;
+ console.log(row);
this.getDictionaryData();
this.getData();
},
@@ -276,12 +290,11 @@
// 浠呭鏁板�煎垪姹傚拰
if (column.property === 'xqLen' || column.property === 'assignTotalUsage' || column.property === 'outTotalUsage' || column.property === 'totalUsage') {
const values = data.map(item => Number(item[column.property]))
- console.log(values);
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
return prev + (isNaN(curr) ? 0 : curr)
}, 0);
- //淇濈暀涓や綅灏忔暟
+ //淇濈暀4浣嶅皬鏁�
sums[index] = sums[index].toFixed(4)
} else {
sums[index] = '-'
@@ -293,7 +306,7 @@
return sums
},
getData() {
- var wheres = [{ name: "outBSTOrderId", value: this.row.id }];
+ var wheres = [{ name: "outSGOrderId", value: this.row.id }];
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -302,7 +315,7 @@
wheres: JSON.stringify(wheres), // 鏌ヨ鏉′欢锛屾牸寮忎负[{ name: "瀛楁", value: "xx" }]
};
this.http
- .post("api/OutBSTOrderDetail/GetPageData", param, "鏌ヨ涓�")
+ .post("api/OutSGOrderDetail/GetPageData", param, "鏌ヨ涓�")
.then((x) => {
this.tableData = x.rows;
});
@@ -315,22 +328,6 @@
this.$refs.selectedStock.open(row,this.row.outBSTOrderNo);
}
},
- // lockstocks() {
- // if (this.selection.length === 0) {
- // return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- // }
- // var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
- // this.http
- // .post("api/OutboundOrderDetail/LockOutboundStocks", keys, "鏁版嵁澶勭悊涓�")
- // .then((x) => {
- // if (!x.status) return this.$message.error(x.message);
- // this.$message.success("鎿嶄綔鎴愬姛");
- // this.showDetialBox = false;
- // this.$emit("parentCall", ($vue) => {
- // $vue.getData();
- // });
- // });
- // },
outbound() {
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
@@ -357,10 +354,10 @@
getButtonEnable(propName, row) {
if (propName == "assignStock") {
if (
- row.orderDetailStatus !== 0 &&
- row.orderDetailStatus !== 60 &&
- row.orderDetailStatus !== 70 &&
- row.orderDetailStatus !== 80
+ row.outSGOrderDetailStatus !== 0 &&
+ row.outSGOrderDetailStatus !== 60 &&
+ row.outSGOrderDetailStatus !== 70 &&
+ row.outSGOrderDetailStatus !== 80
) {
return true;
} else {
@@ -404,7 +401,7 @@
var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
if (item) {
var dicItem = item.data.find((x) => x.key == row[column.prop]);
- console.log(dicItem);
+ // console.log(dicItem);
if (dicItem) {
return dicItem.value;
} else {
--
Gitblit v1.9.3