修改制品上架任务

common/basic.js

@@ -640,7 +640,6 @@ export function getPackingNumberAndBatch(managementList, itemCode, packingNumber
 		packingNumber: "",
 		batch: ""
 	}
-	debugger
 
 	var manageType = queryManageModel(managementList, itemCode)
 	if (manageType == "BY_QUANTITY") {

pages/productPutaway/coms/comProductJobCard.vue

@@ -9,13 +9,7 @@
 
  			<view class="task_text">
  				<view class="">
- 					零件号 : {{dataContent.itemCode}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					目标库位 : {{dataContent.toLocationCode}}
+ 					供应商代码 : {{dataContent.supplierCode}}
  				</view>
  			</view>
  		</view>

pages/productPutaway/job/productPutawayDetail.vue

@@ -120,15 +120,14 @@
 			this.id = option.id;
 			if (this.id != undefined) {
 				//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
-				// 	this.receive((callback => {
-				// 		this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-				// }
-				this.getDetail();
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.received = true;
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
 			}
 		},
 		//返回首页
@@ -287,11 +286,11 @@
 								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
 									"]已经扫描")
 							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.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;
@@ -299,7 +298,7 @@
 													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 													itemDetail.balance = result.balance;
 													itemDetail.balance.balanceQty = Number(result.balance.qty) 
-													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 													this.calcHandleQty();
 												} else {
@@ -307,19 +306,17 @@
 												}
 											});
 									}else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-											']不一致,不允许转移!', res => {
-												this.scanPopupGetFocus();
-											});
+										
 									}
 									
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty =Number(result.balance.qty)  
-									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.stdPackQty = Number(result.package.stdPackQty)
+									itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}
@@ -409,17 +406,17 @@
 						this.managementList = res.list;
 						var params = this.setParams();
 						console.log("提交" + JSON.stringify(params))
-						// productPutawayJobSubmit(params).then(res => {
-						// 	uni.hideLoading()
-						// 	if (res.data) {
-						// 		this.showCommitSuccessMessage("提交成功<br>生成制品上架记录" + res.data)
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
+						productPutawayJobSubmit(params).then(res => {
+							uni.hideLoading()
+							if (res.data) {
+								this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+							} else {
+								this.showErrorMessage("提交失败[" + res.msg + "]")
+							}
+						}).catch(error => {
+							uni.hideLoading()
+							this.showErrorMessage(error)
+						})
 
 					} else {
 						uni.hideLoading();
@@ -439,6 +436,8 @@
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toLocationCode = this.toLocationCode;
 							subList.push(detail)
 						}
 					})

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.180:12080/admin-api",
+			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",