增加发料和补料的参数

pages/issue/job/issueDetail.vue

@@ -291,6 +291,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+										
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+										
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r

pages/repleinsh/coms/comScanReplishPack.vue

@@ -145,8 +145,8 @@
 				positionInfo: "请选择位置",
 				positionList: [],
 				defaultValueList: [],
-				label:{},
+				label: {},
-				fromInventoryStatuses :"",
+				fromInventoryStatuses: "",
 			}
 		},
 		created() {
@@ -179,7 +179,7 @@
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
-					that.fromInventoryStatuses =this.jobContent.outInventoryStatuses
+					that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
 					that.toLocation = that.dataContent[0];
 					that.toLocationCode = that.dataContent[0].toLocationCode;
 					that.fromLocationList = that.getFromLocationList();
@@ -243,7 +243,8 @@
 							title: '加载中',
 							mask: true
 						})
-						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, balanceRes => {
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
 								if (balanceRes.success) {
 									if (balanceRes.data.list.length == 0) {
 										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
@@ -252,7 +253,7 @@
 											})
 									} else if (balanceRes.data.list.length == 1) {
 										let balance = balanceRes.data.list[0];
-									this.afterGetBalance(result.label, balance,packageInfo);
+										this.afterGetBalance(result.label, balance, packageInfo);
 									} else {
 										this.showBalanceSelect(balanceRes.data.list);
 									}
@@ -271,7 +272,7 @@
 				this.afterGetBalance(this.label, balance);
 			},
 
-			afterGetBalance(label, balance,packageInfo) {
+			afterGetBalance(label, balance, packageInfo) {
 				try {
 					let that = this;
 					let itemCode = label.itemCode;
@@ -292,11 +293,11 @@
 								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
-										that.addRecord(batch, label, balance,packageInfo)
+										that.addRecord(batch, label, balance, packageInfo)
 									} else {
 										//允许修改箱码
 										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-											that.addRecord(batch, label, balance,packageInfo);
+											that.addRecord(batch, label, balance, packageInfo);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
 												res => {
@@ -306,7 +307,7 @@
 										}
 									}
 								} else {
-									that.addRecord(batch, label, balance,packageInfo)
+									that.addRecord(batch, label, balance, packageInfo)
 								}
 							} else {
 								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
@@ -361,14 +362,15 @@
 				return batch;
 			},
 
-			creatRecord(label, balance,packageInfo) {
+			creatRecord(label, balance, packageInfo) {
 				balance.stdPackQty = packageInfo.stdPackQty
 				balance.stdPackUnit = packageInfo.stdPackUnit
 				let record = {
 					itemCode: label.itemCode,
 					packingNumber: label.packingNumber,
 					batch: label.batch,
-					qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
+					qty: Number(balance.qty),
+					// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
 					uom: balance.uom,
 					inventoryStatus: balance.inventoryStatus,
 					balance: balance,
@@ -386,8 +388,8 @@
 				batch.handleQty = handleQty;
 			},
 
-			addRecord(batch, label, balance,packageInfo) {
+			addRecord(batch, label, balance, packageInfo) {
-				let record = this.creatRecord(label, balance,packageInfo);
+				let record = this.creatRecord(label, balance, packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);

pages/repleinsh/job/repleinshDetail.vue

@@ -12,7 +12,8 @@
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="">
 				<view v-for="(toLocation, index) in detailSource">
-					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
+					<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+						@updateData='updateData'>
 					</com-repleish-detail-card>
 				</view>
 			</scroll-view>
@@ -92,8 +93,8 @@
 				detailSource: [], //绑定在页面上的数据源
 				detailOptions: [],
 				scanOptions: [],
-				toLocationCode:'',
+				toLocationCode: '',
-				tolocationTypeList:[]
+				tolocationTypeList: []
 			};
 		},
 
@@ -237,7 +238,7 @@
 					if (res.data) {
 						this.showCommitSuccessMessage("提交成功<br>生成补料记录" + res.data)
 					} else {
-						this.showErrorMessage("提交失败[" + res.msg+"]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -259,6 +260,13 @@
 									batch.Records.forEach(r => {
 										let record = {};
 										record.handleQty = r.qty;
+
+										record.fromPackingNumber = r
+											.packingNumber;
+										record.fromBatch = r.batch;
+										record.fromContainerNumber = r
+											.ContainerNumber;
+
 										record.toContainerNumber = r
 											.ContainerNumber;
 										record.toInventoryStatus = r

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.106: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.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",