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

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: {},
 	});
@@ -1128,7 +1128,7 @@ export function cancleTakeInventoryMoveJob(id) {
  */
 export function inventoryMoveSubmit(params) {
 	return request({
-		url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+		url: baseApi + "/wms/inventorymove-job-main/execute",
 		method: "put",
 		data: params,
 	});
@@ -1619,40 +1619,40 @@ export function getProductPutawayJobDetail(id) {
 }
 
 /**
- * 制品上架 承接
+ * 制品上架任务 承接
  * @param {*} id
  * 
  */
 export function takeProductPutawayJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+		url: baseApi + "/wms/productputaway-job-main/accept?id=" + id,
 		method: "put",
 		data: {},
 	});
 }
 
 /**
- * 制品上架 放弃承接
+ * 制品上架任务 放弃承接
  * @param {*} id
  * 
  */
 export function cancleTakeProductPutawayJob(id) {
 	return request({
-		url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
-		method: "get",
+		url: baseApi + "/wms/productputaway-job-main/abandon?id=" + id,
+		method: "put",
 		data: {},
 	});
 }
 
 
 /**
- * 制品上架 任务提交
+ * 制品上架任务 提交
  * @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,
 	});
@@ -2209,6 +2209,65 @@ export function productPutawayRequestSubmit(params) {
 		data: params,
 	});
 }
+/**
+ * 制品上架申请 处理
+ * @param {*} params 
+ */
+export function productPutawayRequestHandle(id) {
+	return request({
+		url: baseApi + "/wms/productputaway-request-main/handle?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 制品上架申请 提交审批
+ * @param {*} params 
+ */
+export function productPutawayRequestApprove(id) {
+	return request({
+		url: baseApi + "/wms/productputaway-request-main/submit?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 制品上架申请 提交审批通过
+ * @param {*} params 
+ */
+export function productPutawayRequestApproveAgree(id) {
+	return request({
+		url: baseApi + "/wms/productputaway-request-main/agree?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 制品上架申请 审批驳回
+ * @param {*} params 
+ */
+export function productPutawayRequestApproveRefused(id) {
+	return request({
+		url: baseApi + "/wms/productputaway-request-main/refused?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
+
+/**
+ * 制品上架申请 关闭任务
+ * @param {*} params 
+ */
+export function productPutawayRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/productputaway-request-main/close?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
 
 /**
  * 发料申请列表

main.js

@@ -72,6 +72,7 @@ export function startApp(app) {
 				app.config.globalProperties.$recepit_configList = res.data.recepit_configList;
 				getApp().globalData.recepit_configList = res.data.recepit_configList;
 				getApp().globalData.feed_configList = res.data.feed_configList;
+				getApp().globalData.isDevelopment = res.data.baseInfo.isDevelopment.value
 			}
 		},
 		fail: (error) => {

mycomponents/balance/balance.vue

@@ -14,12 +14,16 @@
 				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number( dataContent.qty)"
 					:handleQty="Number (dataContent.handleQty)" :isShowStdPack="isShowStdPack">
 				</compare-qty>
-				<view class="" style="font-size: 40rpx;">
-					<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
-				</view>
-				<view class="" style="font-size: 40rpx;">
-					<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button>
+				<view class="" v-if="isDevlement()">
+					<view class="" style="font-size: 40rpx;">
+						<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
+					</view>
+					<view class="" style="font-size: 40rpx;">
+						<u-button @click="copyPro" size="mini" type="primary">复制制品</u-button>
+					</view>
 				</view>
+				
+				
 			</view>
 		</view>
 		<!-- <u-line></u-line> -->
@@ -102,6 +106,9 @@
 								})
 							}
 						)
+			},
+			isDevlement(){
+				return getApp().globalData.isDevelopment;
 			}
 		}
 	}

mycomponents/recommend/recommend.vue

@@ -17,7 +17,7 @@
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
-				<view class="uni-flex uni-row" style="vertical-align:center">
+				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 					<text style="font-size: 30rpx;color: #2979ff; " 
 						@click="copy">复制采购</text>
 					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
@@ -105,6 +105,9 @@
 						})
 					}
 				)
+			},
+			isDevlement(){
+				return getApp().globalData.isDevelopment;
 			}
 		}
 	}

mycomponents/recommend/recommendCount.vue

@@ -16,7 +16,7 @@
 				<compare-qty :dataContent="detail" :recommendQty="Number(detail.qty)" :isShowRecommendQty="isShowRecommendQty"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
-				<view class="uni-flex uni-row" style="vertical-align:center">
+				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 					<text style="font-size: 30rpx;color: #2979ff; " 
 						@click="copy">复制采购</text>
 					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
@@ -108,6 +108,9 @@
 						})
 					}
 				)
+			},
+			isDevlement(){
+				return getApp().globalData.isDevelopment;
 			}
 		}
 	}

pages.json

@@ -35,16 +35,16 @@
 				"navigationBarTitleText": "登录",
 				"titleNView": {
 					// "autoBackButton": "true",
-					"buttons": [
-						// 右边按钮
-						{
-							"float": "right",
-							"fontSize": "52rpx", //按钮上文字的大小
-							"text": "\ue706",
-							"fontSrc": "/static/ali_icon/iconfont.ttf"
-						}
-
-					]
+					// "buttons": [
+					// 	// 右边按钮
+					// 	{
+					// 		"float": "right",
+					// 		"fontSize": "52rpx", //按钮上文字的大小
+					// 		"text": "\ue706",
+					// 		"fontSrc": "/static/ali_icon/iconfont.ttf"
+					// 	}
+
+					// ]
 				}
 			}
 		},
@@ -1202,6 +1202,14 @@
 
 			}
 		},
+		{
+			"path": "pages/productPutaway/request/putawayRequestCreate",
+			"style": {
+				"navigationBarTitleText": "制品上架申请创建",
+				"enablePullDownRefresh": false
+		
+			}
+		},
 
 		{
 			"path": "pages/productDismantle/job/productDismantleJob",

pages/customerReturn/job/returnDetail.vue

@@ -270,27 +270,39 @@
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								
+								
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.balance.qty)
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty =  Number(result.balance.qty)
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty)
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty =  Number(result.balance.qty)
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/inspect/job/inspectDetail.vue

@@ -309,17 +309,25 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续检验?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.balance.qty)
-												itemDetail.balance = result.balance;
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续检验?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.balance = result.balance;
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;
@@ -441,7 +449,7 @@
 							detail.failedQty = detail.failedQty;
 							detail.crackQty = detail.crackQty;
 							detail.notPassedQty = detail.failedQty;
-							// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
+							detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
 							detail.inspectUser = this.$store.state.user.id
 
 							//合格数==样品数，全部合格

pages/inspect/job/inspectFullDetail.vue

@@ -148,24 +148,24 @@
 
 		},
 		methods: {
-			deleteFileById(id){
-					deleteFileById(id).then(res=>{
-						
-					})
-				
+			deleteFileById(id) {
+				deleteFileById(id).then(res => {
+
+				})
+
 			},
-			getFileList(id){
+			getFileList(id) {
 				getFileList("jobInspectDetail", id).then(res => {
-					if(res.data){
-						res.data.forEach(res=>{
+					if (res.data) {
+						res.data.forEach(res => {
 							this.deleteFileById(res.id)
 						})
 					}
 				})
 			},
-			
-			clearPicList(subList){
-				subList.forEach(item=>{
+
+			clearPicList(subList) {
+				subList.forEach(item => {
 					this.getFileList(item.id)
 				})
 			},
@@ -325,17 +325,25 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续检验?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.balance.qty)
-												itemDetail.balance = result.balance;
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续检验?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty)
+													itemDetail.balance = result.balance;
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.balance = result.balance;
@@ -353,23 +361,33 @@
 
 			commit() {
 				this.scanCount = getScanCount(this.subList);
-				// if (this.scanCount == 0) {
-				// 	this.showErrorMessage("扫描数为0,请先扫描")
-				// 	return;
-				// }
-				//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
-				if (this.jobContent.allowPartialComplete == "TRUE") {
-					this.submitJob();
+
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
 				} else {
-					//不允许部分提交，提示
-					this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-						"]箱总共[" + this
-						.subList.length + "]箱", res => {
-							if (res) {
-								this.openScanPopup();
-							}
-						});
+					if (this.scanCount == this.subList.length) {
+						this.submitJob();
+					} else {
+						//如果是全检，必须全部扫描-------改为:任务中的是否允许部分提交：nxt 2023年12月13日
+						if (this.jobContent.allowPartialComplete == "TRUE") {
+							this.submitJob();
+						} else {
+							//不允许部分提交，提示
+							this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
+								"]箱总共[" + this
+								.subList.length + "]箱", res => {
+									if (res) {
+										this.openScanPopup();
+									}
+								});
+						}
+					}
 				}
+
+
+
+
 			},
 
 			submitJob() {
@@ -449,7 +467,7 @@
 							detail.failedQty = detail.failedQty;
 							detail.crackQty = detail.crackQty;
 							detail.notPassedQty = detail.failedQty;
-							// detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
+							detail.goodQty = detail.handleQty - detail.failedQty - detail.crackQty;
 							detail.inspectUser = this.$store.state.user.id
 
 							//合格数==样品数，全部合格

pages/inventoryMove/coms/comInventoryJobCard.vue

@@ -3,19 +3,7 @@
  		<view class="task_item">
  			<view class="task_text">
  				<view class="">
- 					物品代码 : {{dataContent.itemCode}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					来源库位 : {{dataContent.fromLocationCode}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					目标库位 : {{dataContent.toLocationCode}}
+ 					申请单号 : {{dataContent.requestNumber}}
  				</view>
  			</view>
  		</view>

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/coms/comMovebalance.vue

@@ -19,7 +19,7 @@
 						:fromInventoryStatus="fromInventoryStatus" :toInventoryStatus="toInventoryStatus">
 					</moveStatus>
 				</view>
-				<view class="">
+				<view class="" v-if="isDevlement()">
 					<view class="" style="font-size: 40rpx;">
 						<u-button @click="copy" size="mini" type="primary">复制箱码</u-button>
 					</view>
@@ -127,6 +127,9 @@
 								})
 							}
 						)
+			},
+			isDevlement(){
+				return getApp().globalData.isDevelopment;
 			}
 		}
 	}

pages/inventoryMove/job/HoldToScrapMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrap'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToScrapJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/OktoScrapMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrap'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='OktoScrapJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/holdToOkMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOk'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='HoldToOkJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -1,5 +1,14 @@
 <template>
 	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header_job_top">
+				<job-top :dataContent="jobContent"></job-top>
+			</view>
+			<view class="header_item">
+				申请单号 : {{jobContent.requestNumber}}
+			</view>
+			<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
+		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -63,7 +72,7 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
-
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 
 	export default {
@@ -75,7 +84,8 @@
 			requiredLocation,
 			comMessage,
 			winScanPackAndLocation,
-			detailInfoPopup
+			detailInfoPopup,
+			jobTop
 		},
 		data() {
 			return {
@@ -95,15 +105,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();
+				}
 			}
 		},
 		//返回首页
@@ -255,32 +264,60 @@
 							} else {
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus){
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续转移?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty =  Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty =Number(result.balance.qty) ;
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
-								} else {
+											});
+									}
+								}else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty =  Number(result.balance.qty) ;
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}
+								
+								
+								// if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+								// 	this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+								// 		']不一致,是否继续转移?', res => {
+								// 			if (res) {
+								// 				itemDetail.scaned = true;
+								// 				itemDetail.handleQty =  Number(result.balance.qty) ;
+								// 				itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+								// 				itemDetail.balance = result.balance;
+								// 				itemDetail.balance.balanceQty = result.balance.qty;
+								// 				itemDetail.balance.stdPackQty = result.package.stdPackQty
+								// 				itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+								// 				this.calcHandleQty();
+								// 			} else {
+								// 				this.scanPopupGetFocus();
+								// 			}
+								// 		});
+								// } else {
+									
+								// }
 							}
 						}
 					}
@@ -325,21 +362,35 @@
 					title: "提交中....",
 					mask: true
 				});
-
+				this.managementList = [];
+				//查询管理模式
+				// this.detailSource.forEach(item => {
+				// 	item.subList.forEach(detail => {
+				// 		if (detail.scaned) {
+				// 			getManagementPrecisions(item.itemCode,detail.toLocationCode,res=>{
+				// 				if (res.success) {
+				// 					this.managementList = this.managementList.concat(res.list)
+									
+				// 				}
+				// 			})
+				// 		}
+				// 	})
+				// })
+				
 				var params = this.setParams();
 				console.log("提交" + JSON.stringify(params))
 
-				// inventoryMoveSubmit(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)
-				// })
+				inventoryMoveSubmit(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)
+				})
 			},
 
 			setParams() {
@@ -349,6 +400,13 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
+							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+							// 	detail.packingNumber, detail.batch);
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toBatch = detail.batch;
+							detail.toContainerNumber = '';
+							
+							detail.toLocationCode = detail.toLocationCode;
 							subList.push(detail)
 						}
 					})
@@ -420,6 +478,7 @@
 					navigateBack(1)
 				})
 			},
+			
 
 		}
 	}

pages/inventoryMove/job/okToHoldMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHold'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='OkToHoldJob'> </comMoveJob>
 	</view>
 </template>
 

pages/inventoryMove/job/scrapToHoldMoveJob.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHold'> </comMoveJob>
+		<comMoveJob ref="comMoveJob" businessTypeCode='ScrapToHoldJob'> </comMoveJob>
 	</view>
 </template>
 

pages/issue/request/issueRequest.vue

@@ -293,10 +293,10 @@
 			issueRequestSubmitApprove(id) {
 				issueRequestSubmitApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			issueRequestClose(id) {
 				issueRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -326,10 +326,10 @@
 			issueRequestSubmitApproveAgree(id) {
 				issueRequestSubmitApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -342,10 +342,10 @@
 			issueRequestSubmitApproveRefused(id) {
 				issueRequestSubmitApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -358,10 +358,10 @@
 			issueRequestHandle(id) {
 				issueRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

pages/productDismantle/job/productDismantleDetail.vue

@@ -286,19 +286,27 @@
 								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
 									"]已经扫描")
 							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-									let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty);
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续拆解?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.label.qty);
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.label.qty);

pages/productPutaway/coms/comProductJobCard.vue

@@ -9,13 +9,7 @@
 
  			<view class="task_text">
  				<view class="">
- 					零件号 : {{dataContent.itemCode}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					目标库位 : {{dataContent.toLocationCode}}
+ 					供应商代码 : {{dataContent.supplierCode}}
  				</view>
  			</view>
  		</view>

pages/productPutaway/job/productPutawayDetail.vue

@@ -120,15 +120,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();
+				}
 			}
 		},
 		//返回首页
@@ -287,31 +286,37 @@
 								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
 									"]已经扫描")
 							} else {
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-									let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
-												this.scanPopupGetFocus();
-											}
-										});
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty) 
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) 
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										
+									}
+									
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number(
-										result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty) 
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance.balanceQty = Number(result.balance.qty) 
+									itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}
@@ -401,17 +406,17 @@
 						this.managementList = res.list;
 						var params = this.setParams();
 						console.log("提交" + JSON.stringify(params))
-						// productPutawayJobSubmit(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)
-						// })
+						productPutawayJobSubmit(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)
+						})
 
 					} else {
 						uni.hideLoading();
@@ -431,6 +436,8 @@
 								detail.packingNumber, detail.batch);
 							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toLocationCode = this.toLocationCode;
 							subList.push(detail)
 						}
 					})

pages/productPutaway/record/productPutawayRecord.vue

@@ -49,7 +49,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 	import {
@@ -119,8 +118,6 @@
 			};
 		},
 		onLoad(option) {
-			this.fromType = option.fromType;
-			this.updateTitle();
 			var typeCode = "ProductPutaway"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -148,16 +145,6 @@
 		mounted() {
 		},
 		methods: {
-			updateTitle(){
-				if(this.fromType=="requestType"){
-					this.showToLoaction=false
-					updateTitle("制品上架申请")
-				}else {
-					updateTitle("制品上架记录")
-					this.showToLoaction=true
-				}
-			},
-			
 			getScanResult(result) {
 				let balance = result.balance;
 				let label = result.label;
@@ -266,22 +253,6 @@
 					mask: true
 				});
 				
-				
-				if(this.fromType=="requestType"){
-					var params = this.setRequestParams()
-					console.log("提交" + JSON.stringify(params))
-					// productPutawayRequestSubmit(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 {
 					//记录有目标库位，需要查询管理模式
 					var itemCodes = []
 					this.detailSource.forEach(item => {
@@ -310,36 +281,9 @@
 							this.showErrorMessage(res.message);
 						}
 					});
-				}
 
 			},
 			
-			setRequestParams(){
-				var subList = []
-				var supplierCode=""
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							if(supplierCode==""){
-								supplierCode = detail.package.supplierCode
-							}
-							subList.push(detail)
-						}
-					})
-				})
-				
-				this.dataContent.subList = subList
-				this.dataContent.supplierCode = supplierCode
-				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";
-				return this.dataContent;
-			},
-			
 			setRecordParams(queryModel) {
 				var subList = []
 				var creator = this.$store.state.user.id

pages/productPutaway/request/putawayRequest.vue

@@ -33,13 +33,19 @@
 
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		clearTirmAndWrap
 	} from '@/common/basic.js';
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
 	import {
 		getProductPutawayRequestList,
+		productPutawayRequestClose,
+		productPutawayRequestApprove,
+		productPutawayRequestApproveAgree,
+		productPutawayRequestApproveRefused,
+		productPutawayRequestHandle
 	} from '@/api/request2.js';
 	import {
 		getDetailOption,
@@ -72,7 +78,6 @@
 				detailAndHandleOption: [],
 				detailAndCloseOption: [],
 				showOptions: [],
-				fromType: "requestType",
 				loadingType: "nomore",
 
 			};
@@ -81,7 +86,7 @@
 			this.detailOptions = getDetailOption();
 			this.detailAndApproveOptions = getDetailAndApproveOption()
 			this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
-				this.detailAndHandleOption = getDetailAndHandleOption()
+			this.detailAndHandleOption = getDetailAndHandleOption()
 			this.detailAndCloseOption = getDetailAndCloseOption()
 
 		},
@@ -202,27 +207,45 @@
 
 			openScanDetailPopup() {
 				uni.navigateTo({
-					url: "../record/productPutawayRecord?fromType=" + this.fromType
+					url: "./putawayRequestCreate"
 				})
 			},
 
 
 			swipeClick(e, dataContent) {
-				if (e.content.text == "详情") {
-					console.log("详情", dataContent.id)
+				var text = clearTirmAndWrap(e.content.text)
+				if (text == "详情") {
 					this.openRequestInfoPopup(dataContent);
-				} else if (e.content.text == "处理") {
-					console.log("处理")
-				} else if (e.content.text == "审批") {
-					console.log("审批")
-				} else if (e.content.text == "审批通过") {
-					console.log("审批通过")
-				} else if (e.content.text == "审批驳回") {
-					console.log("审批驳回")
-				} else if (e.content.text == "关闭") {
-					console.log("关闭")
+				} else if (text == "处理") {
+					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
+						this.productPutawayRequestHandle(dataContent.id)
+					})
+				} else if (text == "提交审批") {
+					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
+						this.productPutawayRequestApprove(dataContent.id)
+					})
+				} else if (text=="审批通过") {
+					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
+						this.productPutawayRequestApproveAgree(dataContent.id)
+					})
+				} else if (text == "审批驳回") {
+					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
+						this.productPutawayRequestApproveRefused(dataContent.id)
+					})
+				} else if (text == "关闭") {
+					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
+						this.productPutawayRequestClose(dataContent.id)
+					})
 				}
 			},
+			showQuestionMessage(hint,callBack){
+				this.$refs.comMessage.showQuestionMessage(hint,
+					res => {
+						if (res) {
+							callBack()
+						}
+					});
+			},
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
 				this.status = jobStatus;
@@ -271,6 +294,83 @@
 					}
 				});
 			},
+			productPutawayRequestApprove(id) {
+				productPutawayRequestApprove(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请提交审批成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请提交审批失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			
+			},
+			
+			productPutawayRequestClose(id) {
+				productPutawayRequestClose(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请关闭成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请关闭失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestApproveAgree(id) {
+				productPutawayRequestApproveAgree(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批通过成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批通过失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestApproveRefused(id) {
+				productPutawayRequestApproveRefused(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请审批驳回成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请审批驳回失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
+			productPutawayRequestHandle(id) {
+				productPutawayRequestHandle(id).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: "申请处理成功"
+						})
+						this.getList("refresh")
+					} else {
+						this.showMessage("申请处理失败")
+					}
+			
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
 
 		}
 	}

pages/productPutaway/request/putawayRequestCreate.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/productReceipt/job/productReceiptDetail.vue

@@ -14,7 +14,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+							@remove="updateData" @updateData="updateData" 
 							:locationTypeList='tolocationTypeList'>
 						</comProductDetailCard>
 					</view>

pages/productionReceipt/job/productionReceiptDetail.vue

@@ -275,32 +275,38 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.supplierCode = supplierCode
-												itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-													.qty) ? Number(result.balance.qty) : Number(result.label.qty);
-												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.supplierCode = supplierCode
+													itemDetail.handleQty = Number(result.balance.qty) 
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) 
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.supplierCode = supplierCode
-									itemDetail.handleQty = Number(result.label.qty) > Number(result.balance
-										.qty) ? Number(result.balance.qty) : Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty) 
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty) 
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/productionReturn/coms/comReturnCommonRequest.vue

@@ -326,10 +326,10 @@
 			productionReturnRequestSubmitApprove(id) {
 				productionReturnRequestSubmitApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -342,10 +342,10 @@
 			productionReturnRequestClose(id) {
 				productionReturnRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -357,10 +357,10 @@
 			productionReturnRequestSubmitApproveAgree(id) {
 				productionReturnRequestSubmitApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -372,10 +372,10 @@
 			productionReturnRequestSubmitApproveRefused(id) {
 				productionReturnRequestSubmitApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -387,10 +387,10 @@
 			productionReturnRequestHandle(id) {
 				productionReturnRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

pages/purchaseReturn/job/returnDetail.vue

@@ -247,29 +247,37 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续退货?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.balance.qty) ;
-												itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty =result.package.stdPackQty
-												itemDetail.balance.stdPackUnit =result.package.stdPackUnit
-												
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续退货?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = result.balance.qty;
+													itemDetail.balance.stdPackQty =result.package.stdPackQty
+													itemDetail.balance.stdPackUnit =result.package.stdPackUnit
+													
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty =result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty =Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit =result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/purchaseReturn/request/returnRequest.vue

@@ -293,10 +293,10 @@
 			purchaseReturnRequestApprove(id) {
 				purchaseReturnRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			purchaseReturnRequestClose(id) {
 				purchaseReturnRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -325,10 +325,10 @@
 			purchaseReturnRequestApproveAgree(id) {
 				purchaseReturnRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -340,10 +340,10 @@
 			purchaseReturnRequestApproveRefused(id) {
 				purchaseReturnRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -355,10 +355,10 @@
 			purchaseReturnRequestHandle(id) {
 				purchaseReturnRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

pages/putaway/job/putawayDetail.vue

@@ -295,28 +295,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.balance.qty) ;
-												itemDetail.toInventoryStatus =result.balance.inventoryStatus
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus =result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.handleQty = Number(result.balance.qty) ;
-									itemDetail.toInventoryStatus =itemDetail.inventoryStatus
+									itemDetail.toInventoryStatus = itemDetail.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/scrap/job/scrapJobDetail.vue

@@ -211,27 +211,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续出库?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = Number(result.label.qty);
-												itemDetail.inventoryStatus = result.balance.inventoryStatus;
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty =  Number(result.balance.qty);
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/scrap/request/scrapRrequest.vue

@@ -287,10 +287,10 @@
 			scrapRequestApprove(id) {
 				scrapRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -304,10 +304,10 @@
 			scrapRequestClose(id) {
 				scrapRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -319,10 +319,10 @@
 			scrapRequestApproveAgree(id) {
 				scrapRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -334,10 +334,10 @@
 			scrapRequestApproveRefused(id) {
 				scrapRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -349,10 +349,10 @@
 			scrapRequestHandle(id) {
 				scrapRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

pages/transfer/job/issueDetail.vue

@@ -269,28 +269,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续出库?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty;
-												itemDetail.toInventoryStatus = result.balance.inventoryStatus
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty =Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty;
+									itemDetail.handleQty =  Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/transfer/job/receiptDetail.vue

@@ -272,28 +272,37 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续入库?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty;
-												itemDetail.toInventoryStatus = result.balance.inventoryStatus
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续入库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+													itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty;
+									itemDetail.handleQty = Number(result.balance.qty) ;
 									itemDetail.toInventoryStatus = result.balance.inventoryStatus
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty = Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/transfer/job/transferDetail.vue

@@ -320,16 +320,24 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续上架?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续上架?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.record = this.createRecordInfo(itemDetail, result.balance);
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
 									itemDetail.record = this.createRecordInfo(itemDetail, result.balance);

pages/unPlanned/job/issueJobDetail.vue

@@ -229,26 +229,36 @@
 								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-										']不一致,是否继续出库?', res => {
-											if (res) {
-												itemDetail.scaned = true;
-												itemDetail.handleQty = result.label.qty
-												itemDetail.balance = result.balance;
-												itemDetail.balance.balanceQty = result.balance.qty;
-												itemDetail.balance.stdPackQty = result.package.stdPackQty
-												itemDetail.balance.stdPackUnit = result.package.stdPackUnit
-												this.calcHandleQty();
-											} else {
+									if(this.jobContent.allowModifyInventoryStatus=="TRUE"){
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,是否继续出库?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty =  Number(result.balance.qty) ;
+													itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.stdPackQty =  Number(result.package.stdPackQty)
+													itemDetail.balance.stdPackUnit = result.package.stdPackUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									}else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
-											}
-										});
+											});
+									}
+									
 								} else {
 									itemDetail.scaned = true;
-									itemDetail.handleQty = result.label.qty
+									itemDetail.handleQty = Number(result.balance.qty) ;
+									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
 									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = result.balance.qty;
-									itemDetail.balance.stdPackQty = result.package.stdPackQty
+									itemDetail.balance.balanceQty =  Number(result.balance.qty) ;
+									itemDetail.balance.stdPackQty = Number(result.package.stdPackQty)
 									itemDetail.balance.stdPackUnit = result.package.stdPackUnit
 									this.calcHandleQty();
 								}

pages/unPlanned/request/issueRequest.vue

@@ -295,10 +295,10 @@
 			unPlannedIssueRequestApprove(id) {
 				unPlannedIssueRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -312,10 +312,11 @@
 			unPlannedIssueRequestClose(id) {
 				unPlannedIssueRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -327,10 +328,11 @@
 			unPlannedIssueRequestApproveAgree(id) {
 				unPlannedIssueRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -342,10 +344,10 @@
 			unPlannedIssueRequestApproveRefused(id) {
 				unPlannedIssueRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -357,10 +359,10 @@
 			unPlannedIssueRequestHandle(id) {
 				unPlannedIssueRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

pages/unPlanned/request/receiptRequest.vue

@@ -293,10 +293,10 @@
 			unPlannedReceiptRequestApprove(id) {
 				unPlannedReceiptRequestApprove(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请提交审批成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请提交审批失败")
 					}
@@ -310,10 +310,10 @@
 			unPlannedReceiptRequestClose(id) {
 				unPlannedReceiptRequestClose(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请关闭成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请关闭失败")
 					}
@@ -325,10 +325,11 @@
 			unPlannedReceiptRequestApproveAgree(id) {
 				unPlannedReceiptRequestApproveAgree(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批通过成功"
 						})
+						this.getList("refresh")
+						
 					} else {
 						this.showMessage("申请审批通过失败")
 					}
@@ -340,10 +341,10 @@
 			unPlannedReceiptRequestApproveRefused(id) {
 				unPlannedReceiptRequestApproveRefused(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请审批驳回成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请审批驳回失败")
 					}
@@ -355,10 +356,10 @@
 			unPlannedReceiptRequestHandle(id) {
 				unPlannedReceiptRequestHandle(id).then(res => {
 					if (res.data) {
-						this.getList("refresh")
 						uni.showToast({
 							title: "申请处理成功"
 						})
+						this.getList("refresh")
 					} else {
 						this.showMessage("申请处理失败")
 					}

static/config.json

@@ -20,7 +20,7 @@
 			"name": "request_url",
 			"value": "http://192.168.0.230:12080/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
-			"chenfang": "http://192.168.0.178:12080/admin-api",
+			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",
 			"liuchen": "http://192.168.0.159:12080/admin-api",
 			"dev": "http://dev.ccwin-in.com:25100/api/admin-api",
@@ -32,7 +32,13 @@
 			"name": "tenantId",
 			"value": "1",
 			"desc": "租户id"
+		},
+		"isDevelopment": {
+			"name": "isDevelopment",
+			"value": true,
+			"desc": "是否是开发模式,true是开发模式,false不是开发模式"
 		}
+		
 
 	},
 	"recepit_configList": [