Browse Source

修改上加任务问题

hella_vue3
niexiting 7 months ago
parent
commit
143e95c540
  1. 5
      .env.development
  2. 52
      src/pages/productPutaway/job/productPutawayDetail.vue
  3. 3
      src/pages/productPutaway/job/productPutawayJob.vue
  4. 1
      src/pages/productReceipt/job/productReceiptDetail.vue

5
.env.development

@ -1,3 +1,2 @@
VITE_BASE_URL=http://192.168.0.113:12080/admin-api
VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api VITE_BASE_URL_IMAGE=http://192.168.0.113:12080/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api

52
src/pages/productPutaway/job/productPutawayDetail.vue

@ -62,12 +62,13 @@
navigateBack, navigateBack,
updateTitle, updateTitle,
getPackingNumberAndBatch, getPackingNumberAndBatch,
getSwitchInfoByCode
} from '@/common/basic.js'; } from '@/common/basic.js';
import { import {
getInventoryStatusName, getInventoryStatusName,
getInventoryStatusDesc, getInventoryStatusDesc,
getDirectoryItemArray getDirectoryItemArray,
} from '@/common/directory.js'; } from '@/common/directory.js';
import { import {
getLocationTypeArray getLocationTypeArray
@ -289,6 +290,10 @@
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描") .fromLocationCode + "】已经扫描")
} else { } else {
this.addDetail(itemDetail, result);
return;
//
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
@ -296,24 +301,40 @@
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.scaned = true; this.addDetail(itemDetail, result);
itemDetail.handleQty = Number(result.balance.qty) // itemDetail.scaned = true;
itemDetail.toInventoryStatus = result.balance.inventoryStatus; // itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance; // itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance.balanceQty = Number(result.balance.qty) // itemDetail.balance = result.balance;
itemDetail.balance.packQty = Number(result.package.packQty) // itemDetail.balance.balanceQty = Number(result.balance.qty)
itemDetail.balance.packUnit = result.package.packUnit // itemDetail.balance.packQty = Number(result.package.packQty)
this.calcHandleQty(); // itemDetail.balance.packUnit = result.package.packUnit
// this.calcHandleQty();
} else { } else {
this.scanPopupGetFocus(); this.scanPopupGetFocus();
} }
}); });
}
} else { } else {
this.addDetail(itemDetail, result);
// itemDetail.scaned = true;
// itemDetail.handleQty = Number(result.balance.qty)
// itemDetail.balance = result.balance;
// itemDetail.toInventoryStatus = result.balance.inventoryStatus;
// itemDetail.balance.balanceQty = Number(result.balance.qty)
// itemDetail.balance.packQty = Number(result.package.packQty)
// itemDetail.balance.packUnit = result.package.packUnit
// this.calcHandleQty();
} }
}
}
}
} catch (e) {
this.showMessage(e.message)
}
},
addDetail(itemDetail, result) {
} else {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) itemDetail.handleQty = Number(result.balance.qty)
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
@ -322,13 +343,6 @@
itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty(); this.calcHandleQty();
}
}
}
}
} catch (e) {
this.showMessage(e.message)
}
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {

3
src/pages/productPutaway/job/productPutawayJob.vue

@ -202,7 +202,8 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './productPutawayDetail?id=' + item.id + '&type=' + item.type url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
.type
}); });
}, },

1
src/pages/productReceipt/job/productReceiptDetail.vue

@ -148,7 +148,6 @@
} else { } else {
this.getDetail(); this.getDetail();
} }
} }
}, },
// //

Loading…
Cancel
Save