1.修复查询货位相关的bug

prod
x_z 2 years ago
parent 8c472a990a
commit 0cf0bfb203

@ -0,0 +1,5 @@
rd /s /q UDI_WMS_NEW
npm run build:prod
exit

@ -162,6 +162,7 @@
:closeDialog="closeDialog" :closeDialog="closeDialog"
:orderQuery="idQuery" :orderQuery="idQuery"
:viewType="viewType" :viewType="viewType"
:errView="errView"
></addOrder> ></addOrder>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
@ -306,6 +307,7 @@ export default {
}, },
], ],
}, },
errView: null
}; };
}, },
components: { components: {
@ -373,6 +375,9 @@ export default {
addOrders(row) { addOrders(row) {
this.idQuery = {}; this.idQuery = {};
this.idQuery = row; this.idQuery = row;
if (row.status === 4) {
this.errView = 1;
}
this.addOrderVisible = true; this.addOrderVisible = true;
}, },
closeDialog() { closeDialog() {

@ -510,6 +510,9 @@ export default {
this.clearDetailList(); this.clearDetailList();
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
if (null === val) {
return;
}
this.currentRow = val; this.currentRow = val;
this.getOrderDetails(); this.getOrderDetails();
}, },
@ -658,10 +661,6 @@ export default {
this.getBizDetailList(); this.getBizDetailList();
}, },
getBizDetailList() { getBizDetailList() {
debugger
if (null == this.currentRow) {
return;
}
if (isBlank(this.currentRow.billNo)) { if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!"); this.$message.error("请先选择需要查询的单据!");
return; return;
@ -698,9 +697,6 @@ export default {
this.getCodeDetailList(); this.getCodeDetailList();
}, },
getCodeDetailList() { getCodeDetailList() {
if (null == this.currentRow) {
return;
}
if (isBlank(this.currentRow.billNo)) { if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!") this.$message.error("请先选择需要查询的单据!")
return; return;
@ -739,9 +735,6 @@ export default {
this.getResultDetailList(); this.getResultDetailList();
}, },
getResultDetailList() { getResultDetailList() {
if (null == this.currentRow) {
return;
}
if (isBlank(this.currentRow.billNo)) { if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据!") this.$message.error("请先选择需要查询的单据!")
return; return;

@ -240,7 +240,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -222,7 +222,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -426,7 +426,7 @@ export default {
invChange() { invChange() {
this.formData.invSpaceCode = null; this.formData.invSpaceCode = null;
this.spaceList = []; this.spaceList = [];
let params = {invStorageCode: this.formData.fromDeptCode}; let params = {invWarehouseCode: this.formData.fromInvCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) { if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) {
this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode; this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode;

@ -231,7 +231,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -261,7 +261,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -242,7 +242,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -338,7 +338,7 @@ export default {
}); });
this.formData.invSpaceCode = null; this.formData.invSpaceCode = null;
this.spaceList = []; this.spaceList = [];
let params = {invWarehouseCode: this.formData.invCode}; let params = {invWarehouseCode: this.formData.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
if (!isBlank(this.countOrder.invSpaceCode)) { if (!isBlank(this.countOrder.invSpaceCode)) {
this.formData.invSpaceCode = this.countOrder.invSpaceCode; this.formData.invSpaceCode = this.countOrder.invSpaceCode;

@ -228,7 +228,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
this.getList(); this.getList();

@ -229,7 +229,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}) })

@ -212,7 +212,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}) })

@ -318,7 +318,7 @@ export default {
invChange() { invChange() {
this.formData.invSpaceCode = null; this.formData.invSpaceCode = null;
this.spaceList = []; this.spaceList = [];
let params = {invWarehouseCode: this.formData.invCode}; let params = {invWarehouseCode: this.formData.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}); });
@ -346,11 +346,22 @@ export default {
// //
updateInvMAOrder(this.formData).then((res) => { updateInvMAOrder(this.formData).then((res) => {
if (!isBlank(this.formData.code)) { if (!isBlank(this.formData.code)) {
//
let flag = false;
for (let i = 0; i < this.detailList.length; i++) {
if (this.detailList[i].code === this.formData.code) {
flag = true;
break;
}
}
//
if (!flag) {
// //
let params = { let params = {
orderIdFk: this.formData.orderId, orderIdFk: this.formData.orderId,
code: this.formData.code code: this.formData.code
} };
addInvMAOrderDetail(params).then((res) => { addInvMAOrderDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("添加成功!"); this.$message.success("添加成功!");
@ -360,6 +371,7 @@ export default {
} }
}); });
} }
}
}).catch((error) => { }).catch((error) => {
this.$message.error("更新单据信息失败!"); this.$message.error("更新单据信息失败!");
}) })

@ -198,7 +198,7 @@ export default {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = {invWarehouseCode: this.filterQuery.invCode}; let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
getInvSpaceList(params).then((res) => { getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || []; this.spaceList = res.data.list || [];
}) })

Loading…
Cancel
Save