修改库存转移

api/request2.js

@@ -1095,26 +1095,26 @@ export function getInventoryMoveJobDetail(id) {
 }
 
 /**
- * 生产收料 任务承接
+ * 库存转移任务 任务承接
  * @param {*} id
  * 
  */
 export function takeInventoryMoveJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+		url: baseApi + "/wms/inventorymove-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 生产收料 放弃承接
+ * 库存转移任务 放弃承接
  * @param {*} id
  * 
  */
 export function cancleTakeInventoryMoveJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/inventorymove-job-main/abandon?id=" + id,
 		method: "put",
 		data: {},
 	});
@@ -1646,13 +1646,13 @@ export function cancleTakeProductPutawayJob(id) {
 
 
 /**
- * 制品上架 任务提交
+ * 制品上架任务 提交
  * @param {*}  任务id
  *
  */
 export function productPutawayJobSubmit(params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
+		url: baseApi + "/wms/productputaway-job-main/execute",
 		method: "put",
 		data: params,
 	});

pages/inventoryMove/coms/comMoveJob.vue

@@ -28,12 +28,9 @@
 </template>
 
 <script>
-	import {
-		getInventoryMoveJobByNumber,
-		cancelTakeJob
-	} from '@/api/request.js';
 	import {
 		getInventoryMoveJobList,
+		cancleTakeInventoryMoveJob
 	} from '@/api/request2.js';
 
 	import {
@@ -226,8 +223,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								var id = dataContent.id
-								this.cancleJob(id);
+								this.cancleJob(dataContent.id);
 							}
 						});
 				}
@@ -238,20 +234,17 @@
 			},
 
 			cancleJob(id) {
-				var data = {
-					jobStatusId: id,
-					jobStatusTableName: "win_job_inventorymove_main",
-					jobStatusTableNameDetail: "win_job_inventorymove_detail",
-					jobStatusSchemaCode: "inventorymovejob",
-				}
-				cancelTakeJob(data).then(res => {
-					this.getList("refresh")
-				}).catch(res => {
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-
-						}
-					});
+				cancleTakeInventoryMoveJob(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"放弃任务成功"
+						})
+					}else {
+						this.showMessage("放弃任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
 				})
 			},
 

pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -95,15 +95,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();
+				}
 			}
 		},
 		//返回首页