Browse Source

修改发料任务执行功能

hella_online_20240829
niexiting 4 months ago
parent
commit
3e058c3aa1
  1. 6
      .env.development
  2. 5
      src/pages/issue/coms/comScanIssuePack.vue
  3. 22
      src/pages/issue/job/issueDetail.vue
  4. 6
      src/pages/issue/job/issueJob.vue

6
.env.development

@ -1,11 +1,11 @@
VITE_BASE_URL=http://172.21.47.239:12080/admin-api VITE_BASE_URL=http://172.21.47.239:12080/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
# 租户配置 # 租户配置
VITE_TENANT='[{"text":"长春1379","value":1}]' VITE_TENANT='[{"text":"长春1379","value":1}]'
# 是否是测试环境 # 是否是测试环境
VITE_isDevelopment=false VITE_isDevelopment=true
# 积木报表请求路径 # 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' VITE_JMREPORT_BASE_URL='http://172.21.32.14:90'

5
src/pages/issue/coms/comScanIssuePack.vue

@ -411,7 +411,7 @@
result.balance = res.data[0] result.balance = res.data[0]
if (result.label.packingNumber != result.balance.packingNumber) { if (result.label.packingNumber != result.balance.packingNumber) {
result.balance.lableQty = result.label.qty result.balance.lableQty = Number(result.label.qty)
} }
this.afterGetBalance(result.label, result.balance, result.package); this.afterGetBalance(result.label, result.balance, result.package);
} else { } else {
@ -667,8 +667,9 @@
packingNumber: label.packingNumber, packingNumber: label.packingNumber,
parentPackingNumber: packageInfo.parentNumber, parentPackingNumber: packageInfo.parentNumber,
batch: label.batch, batch: label.batch,
qty: Number(balance.qty), // qty: Number(balance.qty),
// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty), // qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
qty: balance.lableQty ?? Number(label.qty),
uom: balance.uom, uom: balance.uom,
inventoryStatus: balance.inventoryStatus, inventoryStatus: balance.inventoryStatus,
balance: balance, balance: balance,

22
src/pages/issue/job/issueDetail.vue

@ -476,27 +476,11 @@
this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty + this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
'】与物料需求数量【' + item.qty + '】与物料需求数量【' + item.qty +
'】不一致,是否继续提交', res => { '】不一致,是否继续提交', res => {
if (res) { // if (res) {
this.submit(); // this.submit();
} // }
}); });
} }
// if (item.qty == totalHandleQty&&!isHandleEmpty) {
// //
// console.log("")
// // this.submit();
// } else {
// this.$refs.comMessage.showQuestionMessage('' + totalHandleQty +
// '' + item.qty +
// '', res => {
// if (res) {
// console.log("")
// // this.submit();
// }
// });
// }
}) })
}) })
}, },

6
src/pages/issue/job/issueJob.vue

@ -150,7 +150,7 @@
getBusinessType(this.businessTypeCode, res => { getBusinessType(this.businessTypeCode, res => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType;
this.fromInventoryStatuses = res.fromInventoryStatuses.split(','); this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
// this.openScanPopup(); // this.openScanPopup();
} else { } else {
@ -509,8 +509,8 @@
this.selectItem(list[0]) this.selectItem(list[0])
} }
} else { } else {
this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch + this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch +
']' + "未查找到任务<br>" + "扫描[" + result.scanMessage + "]") "]物料号[" + result.label.itemCode + "]未查找到任务<br>" + "扫描[" + result.scanMessage + "]")
} }
}).catch(error => { }).catch(error => {
this.showMessage(error + "<br>扫描[" + result.scanMessage + "]") this.showMessage(error + "<br>扫描[" + result.scanMessage + "]")

Loading…
Cancel
Save