From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 131 ++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 70 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/outOrderDetail.vue"
index 0357e55..8504352 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/outOrderDetail.vue"
@@ -14,13 +14,13 @@
<span>宸查�変腑 {{ selection.length }} 椤�</span>
</el-col>
<el-col :span="8">
- <el-link
+ <!-- <el-link
type="primary"
size="small"
style="float: right; height: 20px"
@click="lockstocks"
>閿佸畾搴撳瓨</el-link
- >
+ > -->
<el-link
type="primary"
size="small"
@@ -124,14 +124,20 @@
hidden: true,
},
{
- prop: "orderId",
+ prop: "outBSTOrderId",
title: "鍑哄簱鍗曚富閿�",
type: "string",
width: 90,
hidden: true,
},
{
- prop: "materielCode",
+ prop: "materialId",
+ title: "涓婃父鐗╂枡ID",
+ type: "string",
+ width: 120,
+ },
+ {
+ prop: "materialNo",
title: "鐗╂枡缂栧彿",
type: "string",
width: 150,
@@ -141,51 +147,52 @@
title: "鐗╂枡鍚嶇О",
type: "string",
width: 150,
+ hidden: true,
},
{
- prop: "batchNo",
- title: "鎵规鍙�",
+ prop: "width",
+ title: "骞呭",
type: "string",
- width: 90,
+ width: 100,
},
{
- prop: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
+ prop: "xqLen",
+ title: "闇�姹傞暱搴�",
type: "string",
- width: 90,
+ width: 130,
},
{
- prop: "lockQuantity",
- title: "閿佸畾鏁伴噺",
+ prop: "totalUsage",
+ title: "鎬荤敤閲嶉噺",
type: "int",
- width: 90,
+ width: 130,
},
{
- prop: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
+ prop: "assignTotalUsage",
+ title: "宸插垎閰嶉暱搴�",
type: "string",
- width: 90,
+ width: 130,
},
{
- prop: "unit",
- title: "鍗曚綅",
+ prop: "outTotalUsage",
+ title: "宸插嚭闀垮害",
type: "string",
- width: 90,
+ width: 130,
},
{
- prop: "orderDetailStatus",
+ prop: "outBSTOrderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "tag",
width: 180,
- bindKey: "orderDetailStatusEnum",
+ bindKey: "outboundStatusEnum",
},
- {
- prop: "assignStock",
- title: "鎸囧畾搴撳瓨",
- type: "icon",
- width: 90,
- icon: "el-icon-s-grid",
- },
+ // {
+ // prop: "assignStock",
+ // title: "鎸囧畾搴撳瓨",
+ // type: "icon",
+ // width: 90,
+ // icon: "el-icon-s-grid",
+ // },
{
prop: "viewDetail",
title: "鍑哄簱璇︾粏",
@@ -194,33 +201,16 @@
icon: "el-icon-s-operation",
},
{
- prop: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- },
- {
prop: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 160,
- },
- {
- prop: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
+ width: 170,
},
{
prop: "modifyDate",
title: "淇敼鏃堕棿",
type: "datetime",
- width: 160,
- },
- {
- prop: "remark",
- title: "澶囨敞",
- type: "string",
+ width: 170,
},
],
paginations: {
@@ -284,14 +274,15 @@
}
// 浠呭鏁板�煎垪姹傚拰
- // 浠呭鏌愪竴鍒楁眰鍜�
- if (column.property === 'lockQuantity' || column.property === 'overOutQuantity' || column.property === 'orderQuantity') {
+ 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)
+ }, 0);
+ //淇濈暀涓や綅灏忔暟
+ sums[index] = sums[index].toFixed(4)
} else {
sums[index] = '-'
}
@@ -302,7 +293,7 @@
return sums
},
getData() {
- var wheres = [{ name: "orderId", value: this.row.id }];
+ var wheres = [{ name: "outBSTOrderId", value: this.row.id }];
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -311,7 +302,7 @@
wheres: JSON.stringify(wheres), // 鏌ヨ鏉′欢锛屾牸寮忎负[{ name: "瀛楁", value: "xx" }]
};
this.http
- .post("api/OutboundOrderDetail/GetPageData", param, "鏌ヨ涓�")
+ .post("api/OutBSTOrderDetail/GetPageData", param, "鏌ヨ涓�")
.then((x) => {
this.tableData = x.rows;
});
@@ -321,25 +312,25 @@
this.$refs.child.open(row);
} else {
//鐐瑰嚮鎵撳紑鍑哄簱璇︽儏
- this.$refs.selectedStock.open(row);
+ 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();
- });
- });
- },
+ // 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("璇烽�夋嫨鍗曟嵁鏄庣粏");
@@ -347,7 +338,7 @@
var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
this.http
- .post("api/Task/GenerateOutboundTasks", keys, "鏁版嵁澶勭悊涓�")
+ .post("api/Task/CreateBSTOutboundTasks", keys, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3