Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

.gitignore

@@ -2,3 +2,4 @@
 /node_modules
 
 /unpackage
+/static/config.json

common/basic.js

@@ -595,13 +595,12 @@ export function getInspectReasonList(value) {
 // 	else return 'Other'
 // }
 
-export function getPackingNumberAndBatchByList(managementList, itemCode, packingNumber,locationCode, batch) {
+export function getPackingNumberAndBatchByList(managementList, itemCode, packingNumber, locationCode, batch) {
 	var itemInfo = {
 		packingNumber: "",
 		batch: ""
 	}
-
+	var manageType = queryManageModelByList(managementList, itemCode, locationCode)
-	var manageType = queryManageModelByList(managementList, itemCode,locationCode)
 	if (manageType == "BY_QUANTITY") {
 		itemInfo.packingNumber = ""
 		itemInfo.batch = ""
@@ -614,19 +613,22 @@ export function getPackingNumberAndBatchByList(managementList, itemCode, packing
 	} else if (manageType == "BY_UNIQUE_ID") {
 		itemInfo.packingNumber = packingNumber
 		itemInfo.batch = batch
+	} else if (manageType == "") {
+		itemInfo.packingNumber = packingNumber
+		itemInfo.batch = batch
 	}
 	return itemInfo;
 }
 
-export function queryManageModelByList(managementList, itemCode,locationCode) {
+export function queryManageModelByList(managementList, itemCode, locationCode) {
-	var result = managementList.filter(res => {
+	var result = managementList.find(res => {
-		if (res.itemCode == itemCode&&res.locationCode==locationCode) {
+		if (res.itemCode == itemCode && res.locationCode == locationCode) {
 			return res.ManagementPrecision
 		}
 	})
 
 	if (result != undefined) {
-		return result[0].ManagementPrecision
+		return result.ManagementPrecision
 	} else {
 		return ""
 	}
@@ -806,7 +808,7 @@ export function getBatch() {
 	var year = date.getFullYear(); //年
 	var month = date.getMonth() + 1; //月
 	var day = date.getDate(); //日
-	var batch =year.toString()+month.toString()+day.toString()
+	var batch = year.toString() + month.toString() + day.toString()
 	return batch;
 }
 

mycomponents/scan/winScanPackAndLocation.vue

@@ -21,13 +21,14 @@
 					<view class="uni-center" style="width: 25%; ">
 						来源库位
 					</view>
-					<view class="" style="width: 75%;padding: 8rpx">
+					 <!-- style="width: 75%;padding: 8rpx" -->
+					<view class="">
 						<!-- <input v-model="fromLocationCode" placeholder="请扫描来源库位" :focus="locationOnFocus"
 							placeholder-style="font-size:12px" style="padding: 5px;" @confirm="scanLocation" /> -->
 
 						<view v-if='allowModifyLocation'>
 							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
-								@confirm="scanLocation" style='height: 30px;'></uni-combox>
+								@confirm="scanLocation" style='height: 30px;border:1px solid #fff ;'></uni-combox>
 						</view>
 						<view v-else>
 							<text style="padding: 5px">

pages/putaway/record/putawayRecord.vue

@@ -97,14 +97,14 @@
 				detailSource: [], //绑定在页面上的数据源
 				fromLocationInfo: {},
 				fromLocationCode: "",
-				toLocationCode: "",
 				fromlocationTypeList: [],
 				tolocationTypeList: [],
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
 				showToLoaction: true,
-				recommendLocationList: [] //推荐库位列表
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '' //来源仓库
 			};
 		},
 		onLoad(option) {
@@ -143,12 +143,16 @@
 						return res
 					}
 				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
 				if (item == undefined) {
 					// 获取推荐库位
-					this.getRecommendLocation(balance, pack, toLocationCode => {
+					this.getRecommendLocation(balance, pack, toLocation => {
 						var itemp = createItemInfo(balance, pack);
 						let newDetail = createDetailInfo(balance, pack); //
-						newDetail.toLocationCode = toLocationCode;
+						newDetail.toLocationCode = toLocation.code;
+						newDetail.toWarehouseCode = toLocation.warehouseCode;
 						itemp.subList.push(newDetail);
 						this.detailSource.push(itemp)
 					})
@@ -163,8 +167,12 @@
 						}
 					})
 					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
+						this.getRecommendLocation(balance, pack, toLocation => {
-						item.subList.push(newDetail);
+							let newDetail = createDetailInfo(balance, pack);
+							newDetail.toLocationCode = toLocation.code;
+							newDetail.toWarehouseCode = toLocation.warehouseCode;
+							item.subList.push(newDetail);
+						});
 					} else {
 						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
@@ -190,14 +198,14 @@
 							itemCode: balance.itemCode,
 							locationCode: res.data.code
 						})
-						callback(res.data.code);
+						callback(res.data);
 					}).catch(error => {
 						uni.hideLoading()
 						this.showErrorMessage(error)
 					})
 
 				} else {
-					callback(recommend.locationCode);
+					callback(recommend);
 				}
 			},
 
@@ -259,27 +267,25 @@
 				this.$refs.scanPopup.getfocus();
 			},
 
-			scanLocationCode(location, code) {
+			// scanLocationCode(location, code) {
-				this.toLocationCode = code
+			// 	this.toLocationCode = code
-				this.toLocationCode = location;
+			// 	this.toLocationCode = location;
 
-			},
+			// },
 
 			commit() {
-				//查询库位零件关系
+				uni.showLoading({
-
+					title: "提交中....",
-				// uni.showLoading({
+					mask: true
-				// 	title: "提交中....",
+				});
-				// 	mask: true
-				// });
 
 				//记录有目标库位，需要查询管理模式
 				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
 				//2:获取管理模式，封装参数
-				getPrecisionStrategyList(precisionStrategyParams, this.toLocationCode, res => {
+				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						var params = this.setRecordParams(true)
+						var params = this.setRecordParams()
 						console.log("提交参数", JSON.stringify(params));
 
 						putawayRecordSubmit(params).then(res => {
@@ -298,7 +304,6 @@
 						this.showErrorMessage(res.message);
 					}
 				});
-
 			},
 
 
@@ -333,14 +338,16 @@
 				return itemList;
 			},
 
-			setRecordParams(queryModel) {
+			setRecordParams() {
-				var subList = []
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
 				var creator = this.$store.state.user.id
+				var subList = []
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.batch);
+								detail.packingNumber, detail.toLocationCode, detail.batch);
 							detail.toPackingNumber = info.packingNumber;;
 							detail.toContainerNumber = detail.containerNumber
 							detail.toBatch = info.batch;
@@ -351,8 +358,11 @@
 						}
 					})
 				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
 				this.dataContent.subList = subList
-				this.dataContent.creator = creator;
+				debugger;
 				return this.dataContent;
 			},
 
@@ -401,8 +411,7 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
+					this.clear();
-
 				})
 			},
 
@@ -414,6 +423,14 @@
 						this.detailSource.splice(i, 1)
 					}
 				}
+			},
+
+			clear() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
 			}
 		}
 	}

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://dev.ccwin-in.com:25100/api/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",