报废申请

api/request2.js

@@ -2687,8 +2687,8 @@ export function getScrapRequestDetail(id) {
  */
 export function scrapRequestCreate(params) {
 	return request({
-		url: baseApi + "/wms/scrap-job-main/create",
-		method: "put",
+		url: baseApi + "/wms/scrap-request-main/create",
+		method: "post",
 		data: params,
 	});
 }

mycomponents/scan/winScanPackAndLocation.vue

@@ -139,6 +139,7 @@
 				this.$refs.popup.open('bottom');  
 				this.fromInventoryStatuses = jobContent.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				debugger
 				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
 			},
 

pages/package/record/mergePackageRecord.vue

@@ -44,10 +44,13 @@
 
 <script>
 	import {
-		goHome,
+		goHome
+	} from '@/common/basic.js';
+	
+	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
-	} from '@/common/basic.js';
+	} from '@/common/directory.js';
 
 	import {
 		getBusinessType,

pages/package/record/overPackageRecord.vue

@@ -41,10 +41,13 @@
 
 <script>
 	import {
-		goHome,
+		goHome
+	} from '@/common/basic.js';
+	
+	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
-	} from '@/common/basic.js';
+	} from '@/common/directory.js';
 
 	import {
 		getBusinessType,

pages/package/record/splitPackageRecord.vue

@@ -41,9 +41,12 @@
 <script>
 	import {
 		goHome,
+	} from '@/common/basic.js';
+	
+	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
-	} from '@/common/basic.js';
+	} from '@/common/directory.js';
 
 	import {
 		getBusinessType,

pages/pallet/record/unBindPalletRecord.vue

@@ -47,10 +47,13 @@
 		getContainerDetailByNumber
 	} from '@/api/request.js';
 	import {
-		goHome,
-		getDirectoryItemArray
+		goHome
 	} from '@/common/basic.js';
 	
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
 	import {
 		getBusinessType,
 		createItemInfo,

pages/productDismantle/coms/requestInfoPopup.vue

@@ -45,10 +45,11 @@
 <script>
 	import {
 		dateFormat,
-		getDirectoryItemArray,
+		
 	} from '@/common/basic.js';
 	
 	import {
+		getDirectoryItemArray,
 		getInventoryStatusDesc,
 		getLocationTypeNameList
 	} from '@/common/directory.js';

pages/productDismantle/job/productDismantleDetail.vue

@@ -64,8 +64,12 @@
 		getCurrDateTime,
 		navigateBack,
 		getPackingNumberAndBatch,
-		getInventoryStatusName,
 	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusName
+	} from '@/common/directory.js';
+	
 	import {
 		getLocationTypeArray
 	} from '@/common/array.js';

pages/productPutaway/job/productPutawayDetail.vue

@@ -64,8 +64,13 @@
 		getCurrDateTime,
 		navigateBack,
 		getPackingNumberAndBatch,
-		getInventoryStatusName,
 	} from '@/common/basic.js';
+	
+	import {
+		getInventoryStatusName,
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
 	import {
 		getLocationTypeArray
 	} from '@/common/array.js';

pages/putaway/job/putawayDetail.vue

@@ -183,7 +183,6 @@
 					} else {
 						if (res.data.subList.length > 0) {
 							that.jobContent = res.data;
-							that.jobContent.outInventoryStatuses='INSP'
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList)
 

pages/scrap/record/scrapRecord.vue

@@ -50,7 +50,6 @@
 
 <script>
 	import {
-		scrapRequestSubmit,
 		scrapRecordSubmit
 	} from '@/api/request2.js';
 	
@@ -116,12 +115,9 @@
 				businessType: {},
 				reasonList: [],
 				reason: "",
-				fromType:""
 			};
 		},
 		onLoad(option) {
-			this.fromType = option.fromType
-			if(this.fromType=="requestType"){
				updateTitle("报废申请")
			}else {
				updateTitle("报废记录")
			}
 			this.reasonList = getScarpReasonList();
 			var typeCode = "Scrap"
 			getBusinessType(typeCode, res => {
@@ -264,21 +260,6 @@
 				});
 
 				
-				if(this.fromType=="requestType"){
-					var params = this.setRequestParams();
-					console.log("提交" + JSON.stringify(params))
-					// scrapRequestSubmit(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)
-					// })
-				}else {
 					// scrapRecordSubmit(params).then(res => {
 					// 	uni.hideLoading()
 					// 	if (res.data) {
@@ -290,7 +271,6 @@
 					// 	uni.hideLoading()
 					// 	this.showErrorMessage(error)
 					// })
-				}
 
 			},
 

pages/scrap/request/scrapRequestCreate.vue

@@ -5,8 +5,8 @@
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="flex u-col-center" style="width: 100%;background-color:#fff;">
-					<view class="" style="margin-left: 20rpx;  font-size: 30rpx;flex-shrink: 0;">报废原因：</view>
-				<view  style="width: 100%">
+				<view class="" style="margin-left: 20rpx;  font-size: 30rpx;flex-shrink: 0;">报废原因：</view>
+				<view style="width: 100%">
 					<uni-data-picker style="background-color:#fff;margin-right: 20rpx;" class='uni-data-picker'
 						placeholder="请选择报废原因" popup-title="报废原因" :localdata="reasonList" @change="reasonChange">
 					</uni-data-picker>
@@ -54,7 +54,9 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		getCurrDateOneMonthsTimes,
+		navigateBack
 	} from '@/common/basic.js';
 
 	import {
@@ -126,7 +128,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.$refs.comMessage.showBreakMessage(res.message);
 				}
 			});
 
@@ -235,11 +237,11 @@
 
 
 			commit() {
-				if(this.reasonText==""){
+				if (this.reasonText == "") {
 					this.showMessage("请先选择报废原因")
 					return;
 				}
-				if(this.detailSource.length==0){
+				if (this.detailSource.length == 0) {
 					this.showErrorMessage("请先扫描数据")
 					return;
 				}
@@ -249,42 +251,37 @@
 					mask: true
 				});
 
-					var params = this.setRequestParams();
-					console.log("提交" + JSON.stringify(params))
-					// scrapRequestCreate(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)
-					// })
-				
-
+				var params = this.setRequestParams();
+				console.log("提交" + JSON.stringify(params))
+				scrapRequestCreate(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)
+				})
 			},
 
 
-			setRequestParams(){
+			setRequestParams() {
 				var subList = []
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
+							detail.fromLocationCode = detail.locationCode
 							subList.push(detail)
 						}
 					})
 				})
 
 				this.dataContent.subList = subList
-				this.dataContent.businessType = "PurchasePutaway"
-				this.dataContent.departmentCode= "研发部门";
-				this.dataContent.status=  1 ;
-				this.dataContent.autoCommit =  "FALSE";
-				this.dataContent.autoAgree = "FALSE";
-				this.dataContent.autoExecute = "FALSE";
-				this.dataContent.directCreateRecord = "FALSE";
+				this.dataContent.status = 1;
+				this.dataContent.fromWarehouseCode = "W1";
+				this.dataContent.dueTime = getCurrDateOneMonthsTimes();
 				return this.dataContent;
 			},
 
@@ -324,8 +321,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-
+					navigateBack(1)
 				})
 			},
 

pages/unPlanned/record/issueRecord.vue

@@ -51,7 +51,6 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import {
-		unPlannedIssueRequestSubmit,
 		unPlannedIssueRecordSubmit
 	} from '@/api/request2.js';
 

pages/unPlanned/record/receiptRecord.vue

@@ -52,7 +52,6 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 
 	import {
-		unPlannedReceiptRequestbSubmit,
 		unPlannedReceiptRecordbSubmit
 	} from '@/api/request2.js';
 	

static/config.json

@@ -26,6 +26,7 @@
 			"local": "http://localhost:12080",
 			"desc": "api请求地址"
 		},
+		
 		"tenantId": {
 			"name": "tenantId",
 			"value": "1",