From 6c019a2fe748bb00985ca4dac58b440f81026ebd Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 14 Mar 2025 16:30:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repleinsh/job/repleinshTimeDetail.vue | 29 +++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/pages/repleinsh/job/repleinshTimeDetail.vue b/src/pages/repleinsh/job/repleinshTimeDetail.vue
index 411be51e..6382049f 100644
--- a/src/pages/repleinsh/job/repleinshTimeDetail.vue
+++ b/src/pages/repleinsh/job/repleinshTimeDetail.vue
@@ -318,7 +318,7 @@
// 补料数量unexecutedQty
// 已补料数量qty
let requestQty = this.jobContent.unexecutedQty
- debugger
+
if(this.jobContent.qty>=requestQty){
// 已完成
this.showErrorMessage("当前便次补料任务已完成")
@@ -584,17 +584,28 @@
scaned:true,
uom:this.jobContent.uom,
handleQty:result.package.qty,// 提交数量
- toPackingNumber:'',// 到包装号
+ toPackingNumber:result.label.packingNumber,// 到包装号
toContainerNumber:'',// 到器具号
- toBatch:'',// 到批次
- toLocationCode:this.jobContent.toLocationCode,// 到库位代码
- toInventoryStatus:this.jobContent.inventoryStatus,// 库存状态
+ toBatch:result.package.batch,// 到批次
+ toLocationCode:result.balance.locationCode,// 到库位代码
+ toInventoryStatus:result.balance.inventoryStatus,// 库存状态
supplierCode:result.package.supplierCode,// 供应商
- fromPackingNumber:result.label.packingNumber,// 从包装号
+ fromPackingNumber:'',// 从包装号
fromContainerNumber:'',// 从器具号
- fromBatch:result.package.batch,// 从批次
- fromParentPackingNumber:result.package.parentNumber,// 从父包装
- fromLocationCode:result.balance.locationCode,// 从库位代码
+ fromBatch:'',// 从批次
+ fromParentPackingNumber:'',// 从父包装
+ fromLocationCode:this.jobContent.toLocationCode,// 从库位代码
+ // toPackingNumber:'',// 到包装号
+ // toContainerNumber:'',// 到器具号
+ // toBatch:'',// 到批次
+ // toLocationCode:this.jobContent.toLocationCode,// 到库位代码
+ // toInventoryStatus:this.jobContent.inventoryStatus,// 库存状态
+ // supplierCode:result.package.supplierCode,// 供应商
+ // fromPackingNumber:result.label.packingNumber,// 从包装号
+ // fromContainerNumber:'',// 从器具号
+ // fromBatch:result.package.batch,// 从批次
+ // fromParentPackingNumber:result.package.parentNumber,// 从父包装
+ // fromLocationCode:result.balance.locationCode,// 从库位代码
})
From 1fef8f7a528ef7361b987398ca75aae0295eda9c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 14 Mar 2025 16:35:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/repleinsh/job/repleinshTimeDetail.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/repleinsh/job/repleinshTimeDetail.vue b/src/pages/repleinsh/job/repleinshTimeDetail.vue
index 6382049f..dffbf6d8 100644
--- a/src/pages/repleinsh/job/repleinshTimeDetail.vue
+++ b/src/pages/repleinsh/job/repleinshTimeDetail.vue
@@ -28,9 +28,9 @@
<view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉-->
<view style="word-break: break-all;">
- <pack :isShowPackingNumberProps="true" :packingCode="item.fromPackingNumber"></pack>
- <batch :batch="item.fromBatch"></batch>
- <location title="来源库位" :locationCode="item.fromLocationCode"></location>
+ <pack :isShowPackingNumberProps="true" :packingCode="item.toPackingNumber"></pack>
+ <batch :batch="item.toBatch"></batch>
+ <location title="来源库位" :locationCode="item.toLocationCode"></location>
<!-- <recommend :isShowPackingNumberProps="true" :isShowPack="true" :detail="item" :isShowLocation="false" :isShowFromLocation="true" :isShowToLocation="false"></recommend> -->
</view>