修改任务允许修改库存状态

pages/customerReturn/job/returnDetail.vue

@@ -270,27 +270,39 @@
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								
+								
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
 													itemDetail.scaned = true;
 													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty =  Number(result.balance.qty)
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty)
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty =  Number(result.balance.qty)
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/inspect/job/inspectDetail.vue

@@ -309,7 +309,8 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续检验?', res => {
 												if (res) {
 													itemDetail.scaned = true;
@@ -320,6 +321,13 @@
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;

pages/inspect/job/inspectFullDetail.vue

@@ -325,7 +325,8 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续检验?', res => {
 												if (res) {
 													itemDetail.scaned = true;
@@ -336,6 +337,13 @@
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;

pages/inventoryMove/job/HoldToScrapMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrapJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/OktoScrapMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrapJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/holdToOkMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOkJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -265,31 +265,59 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus){
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续转移?', res => {
 												if (res) {
 													itemDetail.scaned = true;
 													itemDetail.handleQty =  Number(result.balance.qty) ;
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty =Number(result.balance.qty) ;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
 								}else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty =  Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}
+								
+								
+								// if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+								// 	this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+								// 		']不一致,是否继续转移?', res => {
+								// 			if (res) {
+								// 				itemDetail.scaned = true;
+								// 				itemDetail.handleQty =  Number(result.balance.qty) ;
+								// 				itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+								// 				itemDetail.balance = result.balance;
+								// 				itemDetail.balance.balanceQty = result.balance.qty;
+								// 				itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// 				itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// 				this.calcHandleQty();
+								// 			} else {
+								// 				this.scanPopupGetFocus();
+								// 			}
+								// 		});
+								// } else {
+									
+								// }
 							}
 						}
 					}

pages/inventoryMove/job/okToHoldMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHoldJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/scrapToHoldMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHoldJob'> </comMoveJob>
 	</view>
 </template>
 

pages/productDismantle/job/productDismantleDetail.vue

@@ -286,11 +286,12 @@
 								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
 									"]已经扫描")
 							} else {
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-										']不一致,是否继续上架?', res => {
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续拆解?', res => {
 												if (res) {
 													itemDetail.scaned = true;
 													itemDetail.handleQty = Number(result.label.qty);
@@ -299,6 +300,13 @@
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.label.qty);

pages/productPutaway/job/productPutawayDetail.vue

@@ -287,31 +287,39 @@
 								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
 									"]已经扫描")
 							} else {
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (itemDetail.inventoryStatus != result.balance.inventoryStatus){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+													itemDetail.handleQty = Number(result.balance.qty) 
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) 
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
+									itemDetail.handleQty =Number(result.balance.qty)  
-										result.balance.qty) : Number(result.label.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) 
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -275,32 +275,38 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
 													itemDetail.scaned = true;
 													itemDetail.supplierCode = supplierCode
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+													itemDetail.handleQty = Number(result.balance.qty) 
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) 
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.supplierCode = supplierCode
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
+									itemDetail.handleQty = Number(result.balance.qty) 
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) 
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/purchaseReturn/job/returnDetail.vue

@@ -247,7 +247,8 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续退货?', res => {
 												if (res) {
 													itemDetail.scaned = true;
@@ -263,13 +264,20 @@
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty =result.package.stdPackQty
+									itemDetail.balance.stdPackQty =Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit =result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/putaway/job/putawayDetail.vue

@@ -295,28 +295,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
 													itemDetail.scaned = true;
 													itemDetail.handleQty = Number(result.balance.qty) ;
 													itemDetail.toInventoryStatus =result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = itemDetail.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/scrap/job/scrapJobDetail.vue

@@ -211,27 +211,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续出库?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty);
+													itemDetail.handleQty = Number(result.balance.qty);
-												itemDetail.inventoryStatus = result.balance.inventoryStatus;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty =  Number(result.balance.qty);
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/transfer/job/issueDetail.vue

@@ -269,28 +269,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续出库?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty;
+													itemDetail.handleQty =Number(result.balance.qty) ;
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty;
+									itemDetail.handleQty =  Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/transfer/job/receiptDetail.vue

@@ -272,28 +272,37 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续入库?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty;
+													itemDetail.handleQty = Number(result.balance.qty) ;
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty;
+									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/transfer/job/transferDetail.vue

@@ -320,6 +320,7 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
 										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
@@ -330,6 +331,13 @@
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.record = this.createRecordInfo(itemDetail, result.balance);

pages/unPlanned/job/issueJobDetail.vue

@@ -229,26 +229,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续出库?', res => {
 												if (res) {
 													itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty
+													itemDetail.handleQty =  Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty
+									itemDetail.handleQty = Number(result.balance.qty) ;
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
+									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}