diff --git a/src/api/inventory/invPlace.js b/src/api/inventory/invPlace.js
index 184d0421..668f65e3 100644
--- a/src/api/inventory/invPlace.js
+++ b/src/api/inventory/invPlace.js
@@ -39,3 +39,12 @@ export function getInvPlaceOrderList(params) {
params: params
});
}
+
+export function getInvPlaceOrderDetailList(params) {
+ return axios({
+ url: "/spms/inv/product/getInvPlaceOrderDetailList",
+ method: "get",
+ params: params
+ });
+}
+
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index a50f5810..c38cf114 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -112,22 +112,24 @@
border>
-
-
-
-
-
- {{ typeNames[scope.row.type] }}
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
@@ -87,7 +89,7 @@
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getInvSpaceList} from "@/api/inventory/invSpace";
import {isBlank} from "@/utils/strUtil";
-import {bindInvSpace, getInvProductInfo} from "@/api/inventory/invPlace";
+import {bindInvSpace, getInvPlaceOrderDetailList, getInvProductInfo} from "@/api/inventory/invPlace";
export default {
props: {
@@ -105,6 +107,7 @@ export default {
invSpaceName: null,
code: null,
},
+ orderId: null,
list: [],
codeArray: [],
invList: [],
@@ -132,14 +135,11 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- this.list.forEach((item) => {
- this.codeArray.push(item.code);
- });
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode,
type: 1, //按物资上架
- codeArray: this.codeArray
+ orderId: this.orderId,
};
bindInvSpace(params).then((res) => {
if (res.code === 20000) {
@@ -162,6 +162,7 @@ export default {
invSpaceName: null,
code: null,
};
+ this.orderId=null;
this.codeArray = [];
this.list = [];
//光标切回货位框
@@ -233,7 +234,7 @@ export default {
}
if (isBlank(this.formData.invSpaceCode)) {
- this.$message.error('当前货位不能为空');
+ this.$message.error('上架货位不能为空');
return;
}
@@ -244,16 +245,20 @@ export default {
},
getInvProductInfo(code) {
let params = {
+ orderId: this.orderId,
invCode: this.formData.invCode,
- code: code
+ code: code,
+ invSpaceCode: this.formData.invSpaceCode,
};
getInvProductInfo(params).then((res) => {
- if (res.data !== null) {
- res.data.forEach((item) => {
- this.list.push(item);
+ if (res.code == 20000) {
+ debugger
+ this.orderId=res.data;
+ getInvPlaceOrderDetailList({orderId:this.orderId}).then((res) => {
+ this.list=res.data.list;
});
} else {
- this.$message.warning("未查询到产品信息");
+ this.$message.warning(res.message);
}
})
},
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 69ed1dc2..f9ad0da3 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -69,7 +69,6 @@
label-positiom="right"
label-width="200px"
:inline="true"
- disabled
>
-
-
-
+
+
+
+
+
+
+
+
+
-
+
@@ -339,11 +338,11 @@
size="small"
type="number"
v-model="configQuery.orderToInSyncTime"
- :disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
>
+
@@ -424,18 +423,18 @@
:disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
>
+
+
+
+
+
+
+
+
+
+
+
- 单据下载时间间隔(单位:分钟):
-