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

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -418,6 +418,7 @@
 					newDetail.managementTypeParams = managementTypeParams;
 					newDetail.fromLocationCode = result.fromLocationCode
 					newDetail.handleQty = Number(result.label.qty)
+					newDetail.batch = result.label.batch
 					newDetail.packQty = balance.packQty;
 					newDetail.packUnit = balance.packUnit;
 					itemp.subList.push(newDetail);
@@ -460,6 +461,7 @@
 						newDetail.toLocationCode = this.toLocationCode;
 						newDetail.managementTypeParams = managementTypeParams;
 						newDetail.fromLocationCode = result.fromLocationCode
+						newDetail.batch = result.label.batch
 						newDetail.handleQty = result.label.qty
 						newDetail.packQty = balance.packQty;
 						newDetail.packUnit = balance.packUnit;

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -551,6 +551,8 @@
 				let str1 = ''
 				this.detailSource.forEach((item) => {
 					item.subList.forEach(cur => {
+						
+						if(cur.scaned){
 							if (cur.qty != cur.handleQty) {
 								var tempHandleQty = 0
 								if (cur.handleQty) {
@@ -560,13 +562,12 @@
 								}
 								str +=
 									`物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
-							if( cur.handleQty > cur.balance.balanceQty){
+								if(cur.handleQty > cur.balance.balanceQty){
-								console.log(2333,cur.handleQty)
-								console.log(2333,cur.balance.balanceQty)
 									str1 +=
 										`物料号【${item.itemCode}】批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
 								}
 							}
+						}
 					})
 				})
 				if(str1){

src/pages/issue/job/issueDetailBatch.vue

@@ -621,6 +621,7 @@
 				let str=""
 				let str1=""
 				let str2=""
+				let str3=""
 				var totalQty =0;
 				var taskQty =0;
 				console.log(877,this.detailSource)
@@ -629,45 +630,46 @@
 						if(item.scaned){
 							taskQty =calc.add(taskQty,item.qty)
 							totalQty =calc.add(totalQty,item.handleQty)
-							if (this.jobContent.allowSmallerQty == "FALSE") {
 							if(parseFloat(item.handleQty)<parseFloat(item.qty)){
 								str +=	`批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不允许小于任务数量【${item.qty}】`
+								str3 +=	`批次【${item.batch}】扫描数量【${parseFloat(item.handleQty)}】和任务数量【${item.qty}】不一致`
 							}
-							}
-							if (this.jobContent.allowBiggerQty == 'FALSE') {
 							if (parseFloat(	item.handleQty )> 	parseFloat(item.qty)){
 								str1 += `批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不允许大于任务数量【${item.qty}】`
 							}
-							}
+							
 							if(parseFloat(item.handleQty)>parseFloat(	item.balance.qty)){
 								str2 +=	`批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不可以大于库存数量【${item.balance.qty}】`
 							}
+							
 						}
 					
 					})
 				})
-				console.log(877,str)
+				if (this.jobContent.allowSmallerQty == "FALSE") {
 					if (str) {
-					str1 = '不允许提交\n' + str
+						str = '不允许提交\n' + str
 						this.showErrorMessage(str)
 						return
 					}
+				}
+				if (this.jobContent.allowBiggerQty == 'FALSE') {
 					if (str1) {
 						str1 = '不允许提交\n' + str1
 						this.showErrorMessage(str1)
 						return
 					}
+				}
+				
 				if (str2) {
 					str2 = '不允许提交\n' + str2
 					this.showErrorMessage(str2)
 					return
 				}
-				if(str){
+				console.log(str3)
-					str = '任务明细未全部完成,是否提交?\n' + str
+				if(str3){
-				}
+					str3 = str3+",是否提交"
-				if(totalQty!=taskQty){
+					this.$refs.comMessage.showQuestionMessage1(str3, 'red', res => {
-					str ="扫描数量["+totalQty+"]与任务数量不一致["+taskQty+"],是否提交"
-					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							//防止重复点击
 							this.$throttle(this.submit, 2000, this)()

src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue

@@ -11,7 +11,7 @@
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
-				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"
+				<package-list ref='packageListRef' :dataContent="dataContent.subList" :isEdit="false"
 					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
 					:isShowFromLocation="false" :isShowPackingNumberProps='true'></package-list>
 			</uni-collapse-item>

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -5,7 +5,7 @@
 				<view class="header_job_top">
 					<jobTopAsn :dataContent="jobContent"></jobTopAsn>
 				</view>
-				<view v-if="operation=='receipt' && (managementList == 'BY_BATCH' || managementType == 'BY_QUANTITY')" class="uni-flex uni-row "
+				<view v-if="operation=='receipt' && (managementList != 'BY_BATCH' && managementType != 'BY_QUANTITY')" class="uni-flex uni-row "
 					style=";margin-top: 10rpx; margin-left: 10rpx; text-align: right;">
 					<view class="font_default" style="display: block; ">
 						整单收货
@@ -507,7 +507,8 @@
 											pack.qty = batchDetailList[i].qty
 											
 											pack.toLocationCode = this.toLocationCode;
-											pack.labelQty = Number(qty);
+											console.log(999,result.package)
+											pack.labelQty = Number(result.package.packQty);
 											pack.scaned = true;
 											// 当前批次剩余可以扫进的数量大于当前扫描的标签数量的时候直接插入当前的批次
 										if(handleQtySub >= parseFloat(qty)){
@@ -691,15 +692,16 @@
 					let str = ''
 					let str1 = ''
 					var scanCount=0;
+					this.jobContent.allowBiggerQty = "FALSE"
 					this.detailSource.forEach((item) => {
 						item.subList.forEach(cur=>{
 							if(cur.scaned){
 								scanCount++;
 								if(parseFloat(cur.qty)>parseFloat(cur.handleQty)){
-									str += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以小于任务数量【${cur.qty}】\n`
+									str += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】小于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
 								if(parseFloat(cur.qty)<parseFloat(cur.handleQty)){
-									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于任务数量【${cur.qty}】\n`
+									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】扫描数量【${cur.handleQty}】大于任务推荐数量【${cur.qty}】，\n请修改后再提交`
 								}
 							}
 						})
@@ -710,12 +712,12 @@
 							return;
 						}
 					}
-					if(this.jobContent.allowSmallerQty == "FALSE"){
+					// if(this.jobContent.allowSmallerQty == "FALSE"){
-						if(str){
+					// 	if(str){
-							this.$refs.comMessage.showErrorMessage(str);
+					// 		this.$refs.comMessage.showErrorMessage(str);
-							return;
+					// 		return;
-						}
+					// 	}
-					}
+					// }
 					if(this.scanCount  < this.subList.length){
 						//扫描数量小于任务数量，判断是否允许部分提交
 						if (this.jobContent.allowPartialComplete == "TRUE") {

src/pages/putaway/job/putawayDetail.vue

@@ -655,7 +655,7 @@
 									str1 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于任务数量【${cur.qty}】\n`
 								}
 								if(parseFloat(cur.handleQty)>parseFloat(cur.balanceQty)){
-									str2 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.qty}】\n`
+									str2 += `物料号【${item.itemCode}】批次【${cur.batch}】实际提交数量【${cur.handleQty}】不可以大于库存数量【${cur.balanceQty}】\n`
 								}
 							}
 						})