diff --git a/.env.development b/.env.development
index 96e32fde..a4608106 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 #VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
 #VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
 
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL=http://172.21.32.14:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api
 
# 租户配置
VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
diff --git a/src/api/request2.js b/src/api/request2.js
index b49c8a03..163e023e 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2,7 +2,7 @@ import request from './httpRequest3.js'
 import storage from '../common/utils/storage.js'
 //公司地址
 // 本地地址
-const baseApi =  ''
+const baseApi = ''
 /**
  * 获取验证码
  * @param {*}  
@@ -17,7 +17,7 @@ export function getCaptchaImage(params) {
 /**
  * 登录方法
  */
-export function login(username, password, code, uuid,tenantName) {
+export function login(username, password, code, uuid, tenantName) {
 	return request({
 		url: baseApi + '/system/auth/login',
 		headers: {
@@ -178,7 +178,7 @@ export function getMessageUnreadCount() {
  * 获取单据开关配置
  */
 export function getSwitchByCode(params) {
-	
+
 	return request({
 		url: baseApi + "/wms/switch/getSwitchList",
 		method: "post",
@@ -443,9 +443,9 @@ export function getPackageListByNumber(number) {
 export function getMesPackInfo(code) {
 	var params = {
 		filters: [{
-			column:"lowerLim",
-			action:"==",
-			value:code
+			column: "lowerLim",
+			action: "==",
+			value: code
 		}],
 		pageNo: 1,
 		pageSize: 10
@@ -1363,7 +1363,7 @@ export function getProductionReceiptJobByProductionline() {
 		data: {},
 	});
 }
- 
+
 /**
  * 发料任务明细
  * @param {*} 任务id
@@ -1383,10 +1383,10 @@ export function getIssueJobDetail(id) {
  * @param {*} 任务id
  * /wms/issue-request-main
  */
-export function getBalanceByBatchOffShelf(itemCode, qty) {
+export function getBalanceByBatchOffShelf(itemCode, qty, businesstype) {
 	return request({
 		url: baseApi + "/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&&qty=" +
-			qty,
+			qty + "&&businesstype=" + businesstype,
 		method: "get",
 		data: {},
 	});
@@ -4116,7 +4116,7 @@ export function getMainMessage() {
  */
 export function appCheckUpdate() {
 	return request({
-		url: baseApi+"/wms/system-install-package/returnNewFile",
+		url: baseApi + "/wms/system-install-package/returnNewFile",
 		method: "get",
 		data: {}
 	})
@@ -4209,10 +4209,10 @@ export function getPackageLabel(packageCode) {
 		name: name,
 		pageNo: 1,
 		pageSize: 10,
-		sort:"",
-		filters:[{
+		sort: "",
+		filters: [{
 			action: "==",
-			column:"relateNumber",
+			column: "relateNumber",
 			value: packageCode
 		}]
 	}
@@ -4229,7 +4229,7 @@ export function getPackageLabel(packageCode) {
  */
 export function isCheckMesCode(code) {
 	return request({
-		url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code,
+		url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark=" + code,
 		method: "get",
 		data: {},
 	});
@@ -4239,11 +4239,11 @@ export function isCheckMesCode(code) {
  * 获取上架任务打印明细
  * @param {*}  
  */
-export  function getJimuPutawayJobDetail(data) {
-	return  request({
+export function getJimuPutawayJobDetail(data) {
+	return request({
 		url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA",
 		method: "post",
-		data:data
+		data: data
 	});
 }
 
@@ -4251,11 +4251,11 @@ export  function getJimuPutawayJobDetail(data) {
  * 查询库位，后台自己查询管理模式
  * @param {*}  
  */
-export  function getBalanceByParams(data) {
-	return  request({
+export function getBalanceByParams(data) {
+	return request({
 		url: baseApi + "/wms/balance/getBalanceListByPackage",
 		method: "post",
-		data:data
+		data: data
 	});
 }
 
@@ -4264,11 +4264,11 @@ export  function getBalanceByParams(data) {
  * @param {*}  
  */
 
-export  function getBusinessType() {
-	return  request({
+export function getBusinessType() {
+	return request({
 		url: baseApi + "/wms/businesstype/page?pageSize=1000&pageNo=1",
 		method: "get",
-		data:{}
+		data: {}
 	});
 }
 
@@ -4277,11 +4277,12 @@ export  function getBusinessType() {
  * @param {*}  
  */
 
-export  function getPlaneInfoByproductLine(productionLine,planDate) {
-	return  request({
-		url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate,
+export function getPlaneInfoByproductLine(productionLine, planDate) {
+	return request({
+		url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine=" +
+			productionLine + "&planDate=" + planDate,
 		method: "get",
-		data:{}
+		data: {}
 	});
 }
 
@@ -4290,33 +4291,33 @@ export  function getPlaneInfoByproductLine(productionLine,planDate) {
  * @param {*}  
  */
 
-export  function planReceiptSubmit(params) {
-	return  request({
+export function planReceiptSubmit(params) {
+	return request({
 		url: baseApi + "/wms/productreceipt-record-main/createByPlan",
 		method: "post",
-		data:params
+		data: params
 	});
 }
 
 /**
  * @param {Object} params 创建计划完工后调用上架申请 number
  */
-export  function createPutawayRequestByPlan(number) {
-	return  request({
-		url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number="+number,
+export function createPutawayRequestByPlan(number) {
+	return request({
+		url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number=" + number,
 		method: "post",
-		data:{}
+		data: {}
 	});
 }
 
 /**
  * @param {Object} params 创建检验申请 number
  */
-export  function createInspectRequestByPlan(number) {
-	return  request({
-		url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number="+number,
+export function createInspectRequestByPlan(number) {
+	return request({
+		url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number=" + number,
 		method: "post",
-		data:{}
+		data: {}
 	});
 }
 
@@ -4324,11 +4325,11 @@ export  function createInspectRequestByPlan(number) {
 /**
  * @param {Object} params 查询计划报工单号 number
  */
-export  function getPlanByNumber(params) {
-	return  request({
+export function getPlanByNumber(params) {
+	return request({
 		url: baseApi + "/wms/production-detail/senior",
 		method: "post",
-		data:params
+		data: params
 	});
 }
 
diff --git a/src/common/directory.js b/src/common/directory.js
index e922c360..3c2a8980 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -22,6 +22,7 @@ let countStageList = [];
 let locationAreaTypeList = [];
 let businessList = [];
 let countScopeTypeList = [];
+let priorityList  = []
 
 
 
@@ -64,6 +65,7 @@ export function clearCacheData() {
 	locationAreaTypeList = []
 	businessList = []
 	countScopeTypeList = []
+	priorityList  = []
 }
 
 //获取字典信息
@@ -79,7 +81,6 @@ export function getDirectoryInfo(type) {
 			}
 		}
 	}
-
 	return result
 }
 
@@ -614,5 +615,20 @@ export function getPackUnitName(value) {
 	return resultInfo
 }
 
-
+//获取优先级
+export function getPriorityName(value) {
+	var resultInfo = "";
+	if (priorityList.length == 0) {
+		priorityList = getDirectoryInfo("priority")
+	}
+	if (priorityList.length > 0) {
+		for (let item of priorityList) {
+			if (item.value == value) {
+				resultInfo = item.label
+				break;
+			}
+		}
+	}
+	return resultInfo
+}
 locationAreaTypeList
\ No newline at end of file
diff --git a/src/common/noclick.js b/src/common/noclick.js
new file mode 100644
index 00000000..2c4191ee
--- /dev/null
+++ b/src/common/noclick.js
@@ -0,0 +1,25 @@
+// 防止处理多次点击
+function noMultipleClicks(methods, info) {
+    // methods是需要点击后需要执行的函数， info是点击需要传的参数
+    let that = this;
+    if (that.noClick) {
+        // 第一次点击
+        that.noClick= false;
+        if(info && info !== '') {
+            // info是执行函数需要传的参数
+            methods(info);
+        } else {
+            methods();
+        }
+        setTimeout(()=> {
+            that.noClick= true;
+        }, 2000)
+    } else {
+        // 这里是重复点击的判断
+    }
+}
+
+//导出
+export default {
+    noMultipleClicks,//禁止多次点击
+}
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index dacc8147..cb624456 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2085,6 +2085,12 @@ button::after {
 	vertical-align: middle
 }
 
+.card_item_code {
+	color: #329362;
+	padding: 5px;
+	font-size: 30rpx;
+}
+
 .card_packing_code {
 	color: #3315EB;
 	padding: 5px;
@@ -2138,6 +2144,12 @@ button::after {
 	padding: 5px;
 }
 
+.card_level {
+	color: #0689da;
+	padding: 5px;
+	font-size: 30rpx;
+}
+
 .card_supportCode {
 	color: #DA8910;
 	padding: 5px;
@@ -2147,10 +2159,10 @@ button::after {
 	font-size: 32rpx;
 }
 
-.card_item_code {
+/* .card_item_code {
 	color: #F1A532;
 	padding: 5px;
-}
+} */
 
 .card_product_date {
 	color: #329362;
diff --git a/src/main.js b/src/main.js
index 5bd28748..6344a1ab 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,10 +4,12 @@ import './router/my_router.js'; //引入拦截
 import VueClipboard from 'vue-clipboard2' //复制粘贴
 import uView from './uni_modules/vk-uview-ui';// 引入 uView UI
 import comMessage from './mycomponents/common/comMessage.vue'
+import noclick from './common/noclick.js'
 
 // #ifndef VUE3
 import Vue from 'vue'
-console.log("Vuew2222");
+console.log("Vuew2222");//配置公共方法  防治多次点击
+
 Vue.config.productionTip = false
 Vue.prototype.$store = store
 Vue.prototype.$adpid = "1111111111"
@@ -33,8 +35,7 @@ export function createApp() {
 	app.use(VueClipboard)
 	app.use(uView)
 	app.component('comMessage', comMessage)
-	
-	console.log("网络22请求")
+	app.config.globalProperties.$noMultipleClicks = noclick.noMultipleClicks;
 	// startApp(app);
 	return {
 		app,
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index a1e31de1..e3a345e2 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -11,8 +11,6 @@
 			</view>
 			<view class="uni-flex" style="flex-direction: column;">
 				<view class="uni-flex uni-row center">
-
-
 					<!-- 	<qty v-if="dataContent.record==null ||dataContent.record==undefined " :dataContent="dataContent"
 						:isShowStdPack="isShowStdPack" :isShowStatus="isShowStatus"></qty> -->
 					<qty v-if="dataContent.handleQty==0 || dataContent.handleQty==undefined" :dataContent="dataContent"
@@ -22,20 +20,15 @@
 						:isShowStatus='isShowStatus'>
 					</compare-qty>
 
-
 					<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
 						<text style="font-size: 30rpx;color: #2979ff;  width: 20px;" @click="copy">复制</text>
 					</view>
 				</view>
-				<view class="" v-if="dataContent.inventoryStatus">
+				<!-- <view class="" v-if="isShowStatus &&  dataContent.inventoryStatus">
 					<move-status :fromInventoryStatus="dataContent.inventoryStatus">
 					</move-status>
-				</view>
-
+				</view> -->
 			</view>
-
-
-
 		</view>
 		<!-- <u-line></u-line> -->
 	</view>
diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
index 931f3adc..2000cec1 100644
--- a/src/mycomponents/balance/balanceSelect.vue
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -6,7 +6,14 @@
 			<item style="margin: 10rpx;" :dataContent="balanceItems[0]"></item>
 			<view class="popinpop count_shadow" style="width: 90vw;margin: 20rpx 20rpx 30rpx 20rpx;"
 				v-for="(item, index) in balanceItems" :key="item.id" @click="callback(item)">
-				<balance :dataContent="item" :isShowStatus ="false"></balance>
+				<balance :dataContent="item" :isShowStatus="false"></balance>
+			</view>
+			<view class="page-footer">
+				<view class="uni-flex  space-between" style=" width: 100%; ">
+					<!-- <view class=" uni-flex uni-row"> -->
+					<button class="btn_single_reject" hover-class="btn_commit_after" @click="close">关闭</button>
+					<!-- </view> -->
+				</view>
 			</view>
 		</scroll-view>
 	</uni-popup>
@@ -37,13 +44,13 @@
 		},
 		methods: {
 			openPopup(items) {
-				if(Array.isArray(items)){
+				if (Array.isArray(items)) {
 					this.balanceItems = items;
-				}else{
+				} else {
 					this.balanceItems = [items];
 				}
-				
-				
+
+
 				this.$refs['popupItems'].open("center");
 			},
 
@@ -52,9 +59,12 @@
 				this.$refs['popupItems'].close();
 			},
 
+			close() {
+				this.$refs['popupItems'].close();
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/balance/level.vue b/src/mycomponents/balance/level.vue
new file mode 100644
index 00000000..57c2a22e
--- /dev/null
+++ b/src/mycomponents/balance/level.vue
@@ -0,0 +1,37 @@
+<template>
+	<view class="card_view ">
+		<text class="card_level">{{title}}</text>
+		<text class="card_big_content" style="font-size: 40rpx;">{{getPriorityName1()}}</text>
+	</view>
+</template>
+
+<script>
+	import {getPriorityName} from  '@/common/directory.js';
+	export default {
+		components: {
+		},
+		data() {
+			return {}
+		},
+		props: {
+			priority: {
+				type: String,
+				default:'2'
+			},
+			title: {
+				type: String,
+				default: '优先级'
+			},
+			
+		},
+		methods:{
+			getPriorityName1(){
+				return getPriorityName(this.priority)
+			}
+		},
+
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index b37077f0..3fe53d6a 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -9,8 +9,13 @@
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
-				<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
-				</location>
+				<view class="u-flex u-row-between">
+					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
+					</location>
+					<level  title="优先级" :priority="dataContent.priority">
+					</level>
+				</view>
+				
 				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
 				</to-location>
 				<view class="card_view " v-if="isShowDeliverType">
@@ -27,8 +32,8 @@
 	import location from '@/mycomponents/balance/location.vue'
 	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	import batch from '@/mycomponents/balance/batch.vue'
-	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
+	import level from '@/mycomponents/balance/level.vue'
 
 	export default {
 		components: {
@@ -36,8 +41,8 @@
 			location,
 			toLocation,
 			batch,
-			jobComMainCard,
 			itemCompareQty,
+			level
 		},
 		data() {
 			return {};
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index f5fd805e..9ae2850e 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -72,7 +72,7 @@
 
 			isShowStatus: {
 				type: Boolean,
-				default: false
+				default: true
 			},
 
 			isShowFromLocation: {
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 9023f7f6..39b00527 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -72,12 +72,12 @@
 				type: Boolean,
 				default: true
 			},
-			bussinessCode:{
+			bussinessCode: {
 				type: String,
 				default: ''
 			}
-			
-			
+
+
 		},
 		data() {
 			return {
@@ -114,13 +114,13 @@
 
 			},
 
-			 getScanResult(result) {
+			getScanResult(result) {
 				this.resultData = result;
-				if(!result.package){
-					this.showErrorMessage(result.label.code+"包装信息为空")
+				if (!result.package) {
+					this.showErrorMessage(result.label.code + "包装信息为空")
 					return;
 				}
-				this.getItemCodeType(result.package.itemCode,callBack=>{
+				this.getItemCodeType(result.package.itemCode, callBack => {
 					this.queryBalance(this.resultData)
 				})
 			},
@@ -130,11 +130,15 @@
 					itemCode: result.package.itemCode,
 					batch: result.label.batch,
 					packingNumber: result.label.packingNumber,
-					parentPackingNumber:result.package.parentNumber,
+					parentPackingNumber: result.package.parentNumber,
 					inventoryStatus: this.fromInventoryStatuses,
 					areaType: this.fromLocationAreaTypeList,
-					bussinessCode:this.bussinessCode
+					bussinessCode: this.bussinessCode
 				}
+				uni.showLoading({
+					title: '查询中',
+					mask: true
+				})
 				getBalanceByParams(params).then(res => {
 					uni.hideLoading()
 					if (res.data.length == 0) {
@@ -149,10 +153,10 @@
 							"未查找到库存余额"
 						this.showErrorMessage(hint)
 					} else if (res.data.length == 1) {
-						
+
 						result.balance = res.data[0]
-						if(result.label.packingNumber!=result.balance.packingNumber){
-							result.balance.lableQty=result.label.qty
+						if (result.label.packingNumber != result.balance.packingNumber) {
+							result.balance.lableQty = result.label.qty
 						}
 						this.$emit("getBalance", result)
 						// this.closeScanPopup()
@@ -166,7 +170,7 @@
 					this.showErrorMessage(error)
 				})
 			},
-			getItemCodeType(itemCode,callBack) {
+			getItemCodeType(itemCode, callBack) {
 				uni.showLoading({
 					title: "加载中",
 					mask: true
@@ -201,7 +205,7 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-						if(this.$refs.comscan){
+						if (this.$refs.comscan) {
 							this.$refs.comscan.getfocus()
 						}
 					}
@@ -215,12 +219,12 @@
 			closeScanPopup() {
 				this.$refs.popup.close()
 			},
-			getfocus(){
-				if(this.$refs.comscan){
+			getfocus() {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus()
 				}
 			}
-			
+
 
 
 
diff --git a/src/pages.json b/src/pages.json
index 4f875fc9..57d38d42 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -593,7 +593,7 @@
 		{
 			"path": "pages/issue/record/issueRecord",
 			"style": {
-				"navigationBarTitleText": "直接发料记录",
+				"navigationBarTitleText": "先进先出发料",
 				"enablePullDownRefresh": false,
 				"titleNView": {
 					"autoBackButton": "true"
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index dba09b64..ce10f123 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -359,7 +359,7 @@
 						"inventory_status", "container_type", "pack_unit", "unplanned_receipt_reason",
 						"unplanned_issue_reason", "scrap_reason", "inspect_failed_reason",
 						"request_status", "inspect_type", "next_action", "sample_method", "transfer_mode",
-						"count_stage", "inspect_result", "area_type","count_scope_type"
+						"count_stage", "inspect_result", "area_type","count_scope_type","priority"
 					]
 				}
 				getDictionaryItem(params).then(res => {
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index 41628e0b..3b20dfe4 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -23,10 +23,23 @@
 										@confirm="confirmWareHouse"></u-select>
 								</view>
 							</view>
-
+							<view class='split_line'></view>
+	<view class="uni-flex uni-row" style="align-items: center;
+								background-color: #fff; 
+								margin-right: 20rpx;
+								border-radius: 8rpx;
+								">
+								<view class="uni-center" style="width: 25%; font-size: 32rpx; ">
+									优先级
+								</view>
+									<view style="width: 100%;">
+										<uni-data-select style="padding: 20rpx;"  v-model="priority"  :localdata="priorityList"
+											:clear="false"></uni-data-select>
+									</view>
+							</view>
 							<view class='split_line'></view>
 							<view class="uni-flex uni-row padding title u-col-center">
-								<text>位置：</text>
+								<text>目标位置：</text>
 								<view class="uni-flex u-col-center uni-row" @click="showSelect">
 									<view class="" style="margin-left: 20rpx;">
 										{{positionInfo}}
@@ -38,7 +51,7 @@
 							<view class='split_line'></view>
 
 							<view class="title padding" style="display: flex;">
-								<text style=" flex-shrink: 0;">物料：</text>
+								<text style=" flex-shrink: 0;">需求物料：</text>
 								<view class="" style="width: 100% ;">
 									{{itemCode}}
 								</view>
@@ -67,6 +80,7 @@
 								</view>
 							</view>
 							<view class='split_line'></view>
+						
 						</view>
 					</view>
 				</view>
@@ -136,7 +150,21 @@
 				maxlength: 10,
 				stdPackInfo: undefined,
 				wareHouseList: [],
-				showWareHouse: false
+				showWareHouse: false,
+				priorityList: [{
+						value: 0,
+						text: "低"
+					},
+					{
+						value: 1,
+						text: "中"
+					},
+					{
+						value: 2,
+						text: "高"
+					},
+				],
+				priority:1,//优先级
 			}
 		},
 		props: {
@@ -207,6 +235,7 @@
 				this.itemCode = "请扫描物料信息";
 				this.rawLocationCode = ""
 				this.positionInfo = "请选择位置"
+				this.priority = ''
 				this.fromWarehouseCode = "请选择仓库代码"
 				this.workshopCode = "" //车间
 				this.workShopName = ""
@@ -241,6 +270,10 @@
 			},
 
 			confirm() {
+				if (this.priority === '') {
+					this.showErrorMessage("请输入优先级", "priority")
+					return
+				}
 				if (this.positionInfo == "请选择位置") {
 					this.showErrorMessage("请选择位置")
 					return
@@ -286,6 +319,7 @@
 					fgLocationCode: this.fgLocationCode,
 					fromWarehouseCode: this.fromWarehouseCode,
 					toWarehouseCode: this.fromWarehouseCode,
+					priority : this.priority,
 					itemCode: this.itemCode,
 					itemName: this.itemName,
 					uom: this.uom,
diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue
index 478b634c..f40a8116 100644
--- a/src/pages/issue/record/issueRecord.vue
+++ b/src/pages/issue/record/issueRecord.vue
@@ -1,218 +1,379 @@
 <template>
 	<view class="page-wraper">
-		<view class="" v-if='detailSource.length==0'>
-			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="recommendList.length==0"></com-blank-view>
 		</view>
-		<view v-else class="page-wraper">
+		<view class="page-wraper" v-if="recommendList.length>0">
+			<!-- <view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class='split_line'></view>
+			</view> -->
+
+			<view class="page-header">
+				<view class="header_item" style="font-size:35rpx; padding: 10rpx;">
+					<uni-collapse ref="collapse">
+						<uni-collapse-item :open="true">
+							<template v-slot:title>
+								<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
+									先进先出推荐信息
+								</view>
+							</template>
+							<view class="detail-list" v-for="(recommend, index) in recommendList" :key="recommend.id">
+								<view class="card_view">
+									<text class="card_item_code ">物料代码</text>
+									<text class="card_content ">{{recommend.itemCode}}</text>
+								</view>
+								<balance :dataContent='recommend' :isShowStatus='false'></balance>
+							</view>
+						</uni-collapse-item>
+					</uni-collapse>
+				</view>
+			</view>
+
+
 			<view class="page-main">
-				<scroll-view scroll-y="true" class="">
-					<view v-for="(toLocation, index) in detailSource">
-						<view class="uni-row uni-flex">
-							<!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
-							</com-issue-request-info> -->
-							<work-station :workshopCode="workShopCode"
-								:productionLineCode="toLocation.productionLineCode"
-								:workStationCode="toLocation.workStationCode"
-								:rawLocationCode="toLocation.toLocationCode"></work-station>
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								:isShowToLocation="false" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+
 						</view>
-						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
-							@updateData='updateData'
-							@removeItemCode ="removeItemCode"
-							>
-						</com-issue-detail-card>
 					</view>
 				</scroll-view>
-				<button class="btn_add" @click="goScan(false)">+去添加</button>
 			</view>
-			
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
-					<view class="">
+					<view class="uni-row uni-flex">
+						<text>生产线:</text>
+						<view class="uni-flex u-col-center uni-row" @click="showSelect">
+							<view class="" style="margin-left: 20rpx;">
+								{{positionInfo}}
+							</view>
+							<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
+								@confirm="confirmSelect"></u-select>
+						</view>
 					</view>
 					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
 					</view>
 				</view>
 			</view>
-
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		
+		<win-scan-pack-and-location ref="scanPopup" @getResult='onScan' :allowModifyLocation='false'
+			:queryBalance="false">
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 	</view>
-	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList"></com-issue-request-popup>
-	<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
-	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
-	</com-scan-issue-pack>
-	<comMessage ref="comMessage"></comMessage>
-	
-	
 </template>
 
 <script>
 	import {
 		issueRecordSubmit,
+		getWorkShopLineStation,
+		getBalanceByFilter,
 		getBalanceByBatchOffShelf
 	} from '@/api/request2.js';
 
 	import {
 		goHome,
-		getRemoveOption,
-		getISODateTime,
-		getCurrDateTime,
-		getPackingNumberAndBatch
+		getPackingNumberAndBatchByList,
+		deepCopyData
 	} from '@/common/basic.js';
 
 	import {
-		getDataSource
-	} from '@/pages/issue/js/issue.js';
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
 	import {
 		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcTreeHandleQty,
+		calcHandleQty
 	} from '@/common/record.js';
-	import {
-		calc
-	} from '@/common/calc.js';
 
 	import {
-		getManagementPrecisions
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
 	} from '@/common/balance.js';
 
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
-	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
-	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
-	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
-	import workStation from '@/mycomponents/workStation/workStation.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
 
 	export default {
-		name: '',
 		components: {
-			comBlankView,
-			comIssueRequestPopup,
-			jobDetailPopup,
-			comIssueRequestCreator,
-			comIssueRequestInfo,
-			comIssueDetailCard,
 			winScanButton,
-			comScanIssuePack,
-			workStation
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			recordDetailCard,
+			balanceSelect,
+			balance
 		},
 		data() {
 			return {
-				subList: [], //接口返回的任务subList
+				id: '',
+				dataContent: {}, //内容
 				detailSource: [], //绑定在页面上的数据源
-				detailOptions: [],
-				scanOptions: [],
-				workShopCode: "",
-				fromInventoryStatuses: "",
-				toInventoryStatuses: "",
-				requestList: [],
-				dataContent: {},
-				managementList: [],
-				itemCodeTypeList: []
-			}
-		},
-		mounted() {
-
-		},
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				businessTypeCode: "Issue",
+				positionList: [],
+				show: false,
+				positionInfo: "请选择生产线",
+				resultData: {},
+				recommendList: []
+			};
 		},
 		onLoad(option) {
-			var typeCode = "Issue"
-			getBusinessType(typeCode, res => {
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			this.clearData();
+			getBusinessType(this.businessTypeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
-					this.itemCodeTypeList = res.itemCodeTypeList;
-					this.fromInventoryStatuses = res.fromInventoryStatuses
-					this.toInventoryStatuses = res.toInventoryStatuses
-					this.goScan(true)
+					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					this.showFromLocationPopup();
 				} else {
 					this.showErrorMessage(res.message)
 				}
 			});
 
+			// if (this.positionList.length == 0) {
+			getWorkShopLineStation().then(res => {
+				if (res.data != null && res.data.length > 0) {
+					this.positionList = res.data
+				} else {
+					this.showErrorMessage('未查找到位置信息');
+				}
+
+			}).catch(error => {
+				this.showErrorMessage(error);
+			})
+			// }
+
 		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+
 		methods: {
-			closeScan() {
-				this.resizeCollapse();
-			},
-			resizeCollapse() {
-				this.$nextTick(r => {
-					this.$refs.comIssueDetailCard.forEach(r => {
-						r.resizeCollapse();
+			getBalance(label, packageInfo, callback) {
+				var filters = []
+
+				if (packageInfo.parentNumber) {
+					var packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
 					})
-				});
-			},
-			goScan(editPosition) {
-				
-				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: label.packingNumber
+					})
+				}
+
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: label.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: label.batch
+				})
+
+				if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") {
+					filters.push({
+						column: "inventoryStatus",
+						action: "in",
+						value: this.fromInventoryStatuses
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					callback(res.data)
+				}).catch(err => {
+					this.showErrorMessage(err.message);
+				})
 			},
 
-			//确定需求信息
-			requestConfirm(action, item) {
-				if (item.itemCode == '' || item.itemCode == null) return;
+			getScanResult(result) {
+				this.resultData = result;
+				let packageInfo = result.package;
+				this.getBalance(result.label, packageInfo, balances => {
 
-				let that = this;
-				let request = that.requestList.find(r => r.itemCode == item.itemCode);
-				if (request == undefined) {
-					that.requestList.push(item);
-					this.getRecommendInfo(item);
+					//扫描的是外包装
+					let s = '';
+					if (!result.package.parentNumber) {
+						if (balances.list.length == 0) {
+							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+						} else {
+							let newBalances = balances.list.filter(b => b.locationCode == this
+								.fromLocationCode);
+							if (newBalances.length == 0) {
+								this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+							} else if (newBalances.length == 1) {
+								let balance = newBalances[0];
+								result.balance = balance;
+								this.afterGetBalance(result);
+							} else {
+								this.showBalanceSelect(newBalances);
+							}
+						}
+					} else {
+						//扫描的是小包装
+						if (balances.list.length == 0) {
+							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+						} else {
+							//小包装库存
+							let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo
+								.number)
+							//外包装库存
+							let subParentPackitems = balances.list.filter(r => r.packingNumber ==
+								packageInfo
+								.parentNumber && r.locationCode == this.fromLocationCode)
+
+
+							//小包装没有库存，
+							if (subPackitems.length == 0) {
+								//外包装有库存，出库后剩余库存未转换为出库包装规格
+
+								if (subParentPackitems.length > 0) {
+									if (subParentPackitems.length == 1) {
+										let balance = subParentPackitems[0];
+										balance.qty = packageInfo.qty;
+										result.balance = balance;
+										this.afterGetBalance(result);
+									} else {
+										this.showBalanceSelect(subParentPackitems);
+									}
+
+								} else {
+									this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' +
+										packageInfo.number + '】都未查找到库存余额')
+								}
+							} else {
+								var locationCode = this.fromLocationCode
+								if (balances.list == 1) {
+									locationCode = balances.list[0].locationCode
+								} else {
+									var manyBlances = balances.list.filter(r => r.locationCode != this
+										.fromLocationCode)
+									if (manyBlances.length > 0) {
+										locationCode = manyBlances[0].locationCode;
+									}
+								}
+								this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' +
+									locationCode +
+									'】已经有库存余额,请重新扫描')
+							}
+						}
+					}
+				})
+			},
 
-				} else {
-					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
-						if (res) {
-							request.qty = item.qty;
-							that.detailSource.forEach(detail => {
-								let index = detail.Items.findIndex(r => {
-									r.itemCode == item.itemCode
-								})
-								detail.Items.splice(index, 1);
-							})
-							this.getRecommendInfo(item);
+			onScan(result) {
+				let that = this;
+				let pack = result.package;
+				if (that.recommendList.length > 0) {
+					let recommend = that.recommendList.filter(r => r.itemCode == pack.itemCode);
+					if (recommend.length == 0) {
+						this.showErrorMessage('物料代码【' + pack.itemCode + '】不在推荐列表中');
+					} else {
+						let batch = recommend.find(r => r.batch == pack.batch);
+						if (batch == undefined) {
+							that.showErrorMessage('扫描的批次【' + pack.batch + '】,不是系统推荐的批次,不满足系统的先进先出规则,请重新扫描物料');
+						} else {
+							this.getScanResult(result);
 						}
-					});
+					}
+				} else {
+					this.getRecommendInfo(result);
 				}
 			},
 
-			getRecommendInfo(item) {
+			getRecommendInfo(result) {
 				let that = this;
 				uni.showLoading({
 					title: '加载中...',
 					mask: true
 				})
-				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+				let item = {
+					itemCode: result.package.itemCode,
+					qty: result.package.qty,
+				}
+				getBalanceByBatchOffShelf(item.itemCode, item.qty, "issue").then(res => {
 					if (res.data == null) {
-						that.showMessage('未获取到推荐信息');
+						that.showErrorMessage('未获取到推荐信息');
 					} else {
 						if (res.data.length > 0) {
-							that.workShopCode = item.workshopCode;
-							res.data.forEach(r => {
-								r.toLocationCode = item.rawLocationCode;
-								r.productionLineCode = item.productionLineCode;
-								r.workStationCode = item.workStationCode;
-								// r.itemCode = item.itemCode;
-								r.itemName = item.itemName
-								r.uom = item.uom;
-								that.subList.push(r);
-							})
-							that.detailSource = getDataSource(that.detailSource, that.subList)
-							//要修改一下数量
-							that.detailSource.forEach(detail => {
-								detail.Items.forEach(i => {
-									let request = that.requestList.find(r => r
-										.itemCode == i
-										.itemCode);
-									i.qty = request.qty;
-								})
-							})
-							that.resizeCollapse();
+							that.recommendList = res.data;
+							that.recommendList.forEach(r => r.locationCode = r.fromLocationCode)
+							let recommendInfo = res.data[0];
+							if (recommendInfo.batch != result.package.batch) {
+								that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' +
+									recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描');
+							} else {
+								this.getScanResult(result);
+							}
 						} else {
-							that.showMessage('列表数据为0');
+							that.showErrorMessage('未查找到物料的推荐信息');
 						}
 						uni.hideLoading();
 					}
@@ -223,210 +384,419 @@
 			},
 
 
-			caclcQty() {
-				var totalQty = 0;
-				this.detailSource.subList.forEach(res => {
-					totalQty = calc.add(totalQty, res.qty);
-				})
-				this.detailSource.totalQty = totalQty;
+			showBalanceSelect(items) {
+				this.$refs.balanceSelect.openPopup(items);
 			},
 
-			openScanDetailPopup() {
-				var datacontent = {}
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				// Object.assign(datacontent, this.detailSource);
-				var dataContent = {
-					allowModifyPackingNumber: "FALSE",
-					outInventoryStatuses: this.fromInventoryStatuses
-				}
-				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
+			selectBalanceItem(balance) {
+				this.resultData.balance = balance;
+				this.afterGetBalance(this.resultData);
 			},
 
-			closeScanPopup() {
-				this.updateCommitBtn();
+			afterGetBalance(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				let packUnit = pack.packUnit;
+				let packQty = pack.packQty
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.parentNumber = pack.parentNumber;
+					newDetail.packingNumber = pack.number
+					newDetail.packUnit = packUnit;
+					newDetail.packQty = packQty;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					calcHandleQty(this.detailSource);
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.parentNumber = pack.parentNumber;
+						newDetail.packingNumber = pack.number
+						newDetail.packUnit = packUnit;
+						newDetail.packQty = packQty;
+						item.subList.push(newDetail);
+						calcHandleQty(this.detailSource);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
 			},
 
-			updateData(record) {
-				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
-				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
-				let itemHandleQty = 0;
-				if (item != undefined) {
-					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == null || b.packingNumber == '') && b.batch ==
-							record.batch);
-						let handleQty = 0;
-						if (batch != undefined) {
-							batch.Records.forEach(res => {
-								handleQty = calc.add(handleQty, res.qty);
-							})
-							batch.handleQty = handleQty;
-							itemHandleQty = calc.add(itemHandleQty, handleQty)
+
+			getScanResult1(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				let packUnit = pack.packUnit;
+				let packQty = pack.packQty
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.packUnit = packUnit;
+					newDetail.packQty = packQty;
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					calcHandleQty(this.detailSource);
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
 						}
 					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.packUnit = packUnit;
+						newDetail.packQty = packQty;
+						item.subList.push(newDetail);
+						calcHandleQty(this.detailSource);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
 				}
-				this.resizeCollapse();
-				// item.handleQty=itemHandleQty;
-				// this.closeScan();
 			},
-			removeItemCode(){
-				var isClear =this.detailSource[0].Items.length==0
-				if(isClear){
-					this.clearData();
-					this.$refs.comIssueRequestPopup.initData()
+
+			//获取推荐库位
+			getRecommendLocation(balance, pack, callback) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				})
+				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: balance.itemCode,
+						batch: balance.batch,
+						inventoryStatus: balance.inventoryStatus,
+						supplierCode: pack.supplierCode,
+						businessCode: this.businessTypeCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: balance.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+						uni.hideLoading();
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+						uni.hideLoading();
+					})
+
+				} else {
+					callback(recommend);
 				}
-			
 			},
 
-			setParams() {
-				var subList = []
-				var createTime = getCurrDateTime();
-				var creator = this.$store.state.user.id
-				this.detailSource.forEach(toLocationCode => {
-					toLocationCode.Items.forEach(item => {
-						item.Locations.forEach(fromLocation => {
-							fromLocation.Batchs.forEach(batch => {
-								let subItem = batch.detail;
-								subItem.recordList = [];
-								if (batch.Records.length > 0) {
-									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
-											.inventoryStatus;
-										record.toLocationCode = subItem
-											.toLocationCode;
-										record.fromLocationCode = fromLocation
-											.fromLocationCode
-										record.supplierCode = r.supplierCode;
-										
-										let single_price = r.singlePrice == null ?
-											0 : r.singlePrice;
-
-										record.singlePrice = single_price;
-										record.amount = single_price * r.qty;
-
-
-										//使用在途库不改变管理模式
-										var info = getPackingNumberAndBatch(
-											this.managementList, r
-											.itemCode,
-											r.packingNumber, r
-											.batch);
-										record.toPackingNumber = info
-											.packingNumber;
-										record.toBatch = info.batch;
-										subItem.recordList.push(record);
-									})
-									subList.push(subItem);
-								}
-							})
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcTreeHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty, detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			showSelect() {
+				// if (this.editPosition) {
+				this.show = true
+				// }
+			},
+
+			confirmSelect(e) {
+				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
+				console.log("位置", this.positionInfo)
+				this.workshopCode = e[0].value
+				this.productionLineCode = e[1].value
+				this.workStationCode = e[2].value
+				this.workShopName = e[0].label
+				this.productionLineName = e[1].label
+				this.workStationName = e[2].label
+
+				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				if (shop != undefined && shop.children != undefined) {
+					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+					if (prodLine != undefined && prodLine.children != undefined) {
+						let station = prodLine.children.find(r => r.value == this.workStationCode);
+						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+							return;
+						} else {
+							this.rawLocationCode = station.rawLocationCode;
+							this.fgLocationCode = station.fgLocationCode;
+						}
+					} else {
+						this.showErrorMessage("生产线-工位基础信息维护错误")
+					}
+				} else {
+					this.showErrorMessage("车间-生产线基础信息维护错误")
+				}
+
+				//赋值到库位代码
+				let toLocationCode = ''
+				this.positionList.forEach(item => {
+					if (this.workshopCode == item.value) { // 车间
+						item.children.find(child => {
+							if (this.productionLineCode == child.value) {
+								toLocationCode = child.children.find(subChild => this.workStationCode ==
+									subChild.value).rawLocationCode;
+							}
 						})
+					}
+				})
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = toLocationCode
 					})
 				})
 
-				this.dataContent.subList = subList
-				this.dataContent.createTime = createTime;
-				this.dataContent.creator = creator;
-				return this.dataContent;
 			},
-			submit() {
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
 
-				//目前任务只到一个库位
-				var itemCodes = []
-				let locationCode = this.detailSource[0].toLocationCode
-				this.detailSource.forEach(toLocation => {
-					toLocation.Items.forEach(item => {
-						itemCodes.push(item.itemCode)
-					})
-				})
-
-				//获取管理模式，封装参数
-				getManagementPrecisions(itemCodes, locationCode, res => {
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						this.submitJob();
+						var params = {
+							...this.setRecordParams()
+						}
+						console.log("提交参数", JSON.stringify(params));
+
+						issueRecordSubmit(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();
 						this.showErrorMessage(res.message);
 					}
 				});
-
 			},
 
-			submitJob() {
-				var params = this.setParams()
-				console.log("提交参数", JSON.stringify(params));
-				issueRecordSubmit(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)
+			setRecordParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+							submitItem.recordList = [{
+								toInventoryStatus: detail.inventoryStatus,
+								fromParentPackingNumber: detail.parentNumber,
+								fromPackingNumber: info.packingNumber,
+								fromBatch: info.batch,
+								toPackingNumber: info.packingNumber,
+								toBatch: info.batch,
+								fromLocationCode: detail.locationCode,
+								toLocationCode: detail.toLocationCode,
+								handleQty: detail.handleQty,
+								fromPackUnit: detail.packUnit,
+								toPackUnit: detail.packUnit,
+								fromPackQty: detail.packQty,
+								toPackQty: detail.packQty
+							}]
+							subList.push(submitItem)
+						}
+					})
 				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
+				return this.dataContent;
 			},
 
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData();
-					this.$refs.comIssueRequestPopup.initData()
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
 
-				})
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
 			},
-			clearData() {
-				this.subList= [], //接口返回的任务subList
-				this.detailSource=[], //绑定在页面上的数据源
-				this.detailOptions=[],
-				this.scanOptions= [],
-				this.workShopCode="",
-				this.requestList= [],
-				this.dataContent= {},
-				this.managementList= []
-				
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
 			},
 
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-						this.afterCloseMessage()
-					}
-				});
+			closeScanMessage() {
+				this.scanPopupGetFocus();
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {}
-				});
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.toLocationCode = code;
 			},
-			showQuestionMessage(message) {
 
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
 			},
 
-			// this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
-			// 	if (res) {
-			// 		that.clearInfo();
-			// 	}
-			// });
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.$forceUpdate();
+
+			},
 
+			clearData() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+				this.positionInfo = "请选择生产线";
+			}
 		}
 	}
 </script>
 
-<style>
-</style>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/pages/issue/record/issueRecordV1.vue b/src/pages/issue/record/issueRecordV1.vue
new file mode 100644
index 00000000..478b634c
--- /dev/null
+++ b/src/pages/issue/record/issueRecordV1.vue
@@ -0,0 +1,432 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="">
+					<view v-for="(toLocation, index) in detailSource">
+						<view class="uni-row uni-flex">
+							<!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
+							</com-issue-request-info> -->
+							<work-station :workshopCode="workShopCode"
+								:productionLineCode="toLocation.productionLineCode"
+								:workStationCode="toLocation.workStationCode"
+								:rawLocationCode="toLocation.toLocationCode"></work-station>
+						</view>
+						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+							@updateData='updateData'
+							@removeItemCode ="removeItemCode"
+							>
+						</com-issue-detail-card>
+					</view>
+				</scroll-view>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+			
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</view>
+
+		</view>
+		
+	</view>
+	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm' :itemCodeTypeList="itemCodeTypeList"></com-issue-request-popup>
+	<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
+	<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+	</com-scan-issue-pack>
+	<comMessage ref="comMessage"></comMessage>
+	
+	
+</template>
+
+<script>
+	import {
+		issueRecordSubmit,
+		getBalanceByBatchOffShelf
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getRemoveOption,
+		getISODateTime,
+		getCurrDateTime,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+	import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import workStation from '@/mycomponents/workStation/workStation.vue'
+
+	export default {
+		name: '',
+		components: {
+			comBlankView,
+			comIssueRequestPopup,
+			jobDetailPopup,
+			comIssueRequestCreator,
+			comIssueRequestInfo,
+			comIssueDetailCard,
+			winScanButton,
+			comScanIssuePack,
+			workStation
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				workShopCode: "",
+				fromInventoryStatuses: "",
+				toInventoryStatuses: "",
+				requestList: [],
+				dataContent: {},
+				managementList: [],
+				itemCodeTypeList: []
+			}
+		},
+		mounted() {
+
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		onLoad(option) {
+			var typeCode = "Issue"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.fromInventoryStatuses = res.fromInventoryStatuses
+					this.toInventoryStatuses = res.toInventoryStatuses
+					this.goScan(true)
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+
+		},
+		methods: {
+			closeScan() {
+				this.resizeCollapse();
+			},
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+			goScan(editPosition) {
+				
+				this.$refs.comIssueRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+				if (item.itemCode == '' || item.itemCode == null) return;
+
+				let that = this;
+				let request = that.requestList.find(r => r.itemCode == item.itemCode);
+				if (request == undefined) {
+					that.requestList.push(item);
+					this.getRecommendInfo(item);
+
+				} else {
+					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
+						if (res) {
+							request.qty = item.qty;
+							that.detailSource.forEach(detail => {
+								let index = detail.Items.findIndex(r => {
+									r.itemCode == item.itemCode
+								})
+								detail.Items.splice(index, 1);
+							})
+							this.getRecommendInfo(item);
+						}
+					});
+				}
+			},
+
+			getRecommendInfo(item) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+					if (res.data == null) {
+						that.showMessage('未获取到推荐信息');
+					} else {
+						if (res.data.length > 0) {
+							that.workShopCode = item.workshopCode;
+							res.data.forEach(r => {
+								r.toLocationCode = item.rawLocationCode;
+								r.productionLineCode = item.productionLineCode;
+								r.workStationCode = item.workStationCode;
+								// r.itemCode = item.itemCode;
+								r.itemName = item.itemName
+								r.uom = item.uom;
+								that.subList.push(r);
+							})
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							//要修改一下数量
+							that.detailSource.forEach(detail => {
+								detail.Items.forEach(i => {
+									let request = that.requestList.find(r => r
+										.itemCode == i
+										.itemCode);
+									i.qty = request.qty;
+								})
+							})
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+						uni.hideLoading();
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					that.showErrorMessage(error)
+				})
+			},
+
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty, res.qty);
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				var dataContent = {
+					allowModifyPackingNumber: "FALSE",
+					outInventoryStatuses: this.fromInventoryStatuses
+				}
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
+			},
+
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty);
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				this.resizeCollapse();
+				// item.handleQty=itemHandleQty;
+				// this.closeScan();
+			},
+			removeItemCode(){
+				var isClear =this.detailSource[0].Items.length==0
+				if(isClear){
+					this.clearData();
+					this.$refs.comIssueRequestPopup.initData()
+				}
+			
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+								if (batch.Records.length > 0) {
+									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
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.fromLocationCode = fromLocation
+											.fromLocationCode
+										record.supplierCode = r.supplierCode;
+										
+										let single_price = r.singlePrice == null ?
+											0 : r.singlePrice;
+
+										record.singlePrice = single_price;
+										record.amount = single_price * r.qty;
+
+
+										//使用在途库不改变管理模式
+										var info = getPackingNumberAndBatch(
+											this.managementList, r
+											.itemCode,
+											r.packingNumber, r
+											.batch);
+										record.toPackingNumber = info
+											.packingNumber;
+										record.toBatch = info.batch;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.createTime = createTime;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				issueRecordSubmit(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)
+				})
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+					this.$refs.comIssueRequestPopup.initData()
+
+				})
+			},
+			clearData() {
+				this.subList= [], //接口返回的任务subList
+				this.detailSource=[], //绑定在页面上的数据源
+				this.detailOptions=[],
+				this.scanOptions= [],
+				this.workShopCode="",
+				this.requestList= [],
+				this.dataContent= {},
+				this.managementList= []
+				
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showQuestionMessage(message) {
+
+			},
+
+			// this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+			// 	if (res) {
+			// 		that.clearInfo();
+			// 	}
+			// });
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/pages/issue/request/issueRequestCreate.vue b/src/pages/issue/request/issueRequestCreate.vue
index fe896681..63a82335 100644
--- a/src/pages/issue/request/issueRequestCreate.vue
+++ b/src/pages/issue/request/issueRequestCreate.vue
@@ -107,7 +107,6 @@
 
 			//确定需求信息
 			requestConfirm(action, item) {
-
 				if (this.detailSource.subList.length == 0) {
 					this.detailSource = {
 						workshopCode: item.workshopCode,
@@ -119,6 +118,7 @@
 						toLocationCode: item.rawLocationCode,
 						fromWarehouseCode:item.fromWarehouseCode,
 						useOnTheWay:this.useOnTheWay,
+						priority : item.priority,
 						totalQty: 0,
 						subList: []
 					}
@@ -153,7 +153,7 @@
 							qty: item.qty,
 							uom: item.uom
 						}
-
+						this.detailSource.priority =item.priority
 						this.detailSource.subList.push(subItem)
 
 					} else {
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 8a1fab48..6e6c1ef4 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -1,44 +1,58 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='showRequestPopup' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='getBusinessType' v-if="recommendList.length==0"></com-blank-view>
 		</view>
-		<view class="page-wraper" v-if="detailSource.length>0">
+		<view class="page-wraper" v-if="recommendList.length>0">
+			<view class="page-header">
+				<view class="header_item" style="font-size:35rpx; padding: 10rpx;">
+					<uni-collapse ref="collapse">
+						<uni-collapse-item :open="true">
+							<template v-slot:title>
+								<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
+									先进先出推荐信息
+								</view>
+							</template>
+							<view class="detail-list" v-for="(recommend, index) in recommendList" :key="recommend.id">
+								<view class="card_view">
+									<text class="card_item_code ">物料代码</text>
+									<text class="card_content ">{{recommend.itemCode}}</text>
+								</view>
+								<balance :dataContent='recommend' :isShowStatus='false'></balance>
+							</view>
+						</uni-collapse-item>
+					</uni-collapse>
+				</view>
+			</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
-					<view class="detail-list" v-for="(toLocation, index) in detailSource" :key="index">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<view class="page-header">
-								<view class="text_lightblue fontsize-16">目标库位:{{toLocation.toLocationCode}}</view>
-							</view>
-							<com-issue-detail-card ref='comRepleinshDetailCard' :dataContent="toLocation"
-								@updateData='updateData'>
-							</com-issue-detail-card>
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="true" @removeItem="removeItem(index,item)"
+								:isShowToLocation="false" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
 						</view>
-						<!-- <view class='split_line'></view> -->
 					</view>
 				</scroll-view>
 			</view>
-
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList">
+						</requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
 					</view>
 				</view>
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationAreaTypeList="toLocationAreaTypeList"
-			@confirm='requestConfirm'
-			:itemCodeTypeList="itemCodeTypeList">
-		</com-repleinsh-request-popup>
-		<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
-		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
-		</com-scan-issue-pack>
+		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
+		</winComScanBalance>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -46,93 +60,91 @@
 <script>
 	import {
 		repleinshRecordSubmit,
+		validateItemAndLocation,
+		getPutawayRecommendLocation,
+		getBalanceByFilter,
 		getBalanceByBatchOffShelf
 	} from '@/api/request2.js';
 
-	import {
-		calc
-	} from '@/common/calc.js';
-
 	import {
 		goHome,
+		updateTitle,
 		getCurrDateTime,
-		getPackingNumberAndBatch
+		getPackingNumberAndBatchByList,
+		deepCopyData
 	} from '@/common/basic.js';
 
+	import {
+		calc
+	} from '@/common/calc.js';
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
 	} from '@/common/directory.js';
 
-	import {
-		getDetailOption,
-		getDetailRemoveOption,
-		getDetailEditRemoveOption
-	} from '@/common/array.js';
-
 	import {
 		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
 
 	import {
-		getDataSource
-	} from '@/pages/issue/js/issue.js';
-
-	import {
-		getManagementPrecisions
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
 	} from '@/common/balance.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue'
-	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
-	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
 
 	export default {
 		components: {
 			winScanButton,
 			winScanPack,
+			requiredLocation,
 			comBlankView,
+			winScanLocation,
 			winScanPackAndLocation,
 			recordComDetailCard,
-			comRepleinshRequestPopup,
-			comIssueDetailCard,
-			comScanIssuePack
+			winComScanBalance,
+			balance
 		},
 		data() {
 			return {
 				id: '',
-				receiptJob: {},
-				subList: [], //接口返回的任务subList
+				dataContent: {}, //内容
 				detailSource: [], //绑定在页面上的数据源
-				businessTypeInfo: {},
 				fromLocationCode: "",
-				toLocationCode: "",
+				fromLocationAreaTypeList: [],
 				toLocationAreaTypeList: [],
-				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
-				requestList: [],
-				managementList: [],
-				dataContent: {},
-				itemCodeTypeList:[]
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '', //来源仓库
+				businessTypeCode: "Repleinment",
+				toLocationCode: "",
+				resultData: {},
+				itemCode: "",
+				recommendList: []
 			};
 		},
 		onLoad(option) {
-			var typeCode = "Repleinment"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.itemCodeTypeList = res.itemCodeTypeList;
-					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					this.showRequestPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			this.clear();
+			this.getBusinessType()
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -146,77 +158,115 @@
 		onPullDownRefresh() {},
 
 		mounted() {},
+
 		methods: {
-			closeScan() {
-				this.resizeCollapse();
-			},
-			resizeCollapse() {
-				this.$nextTick(r => {
-					this.$refs.comRepleinshDetailCard.forEach(r => {
-						r.resizeCollapse();
-					})
+			getBusinessType() {
+				getBusinessType(this.businessTypeCode, res => {
+					if (res.success) {
+						this.businessType = res.businessType;
+						this.fromInventoryStatuses = getDirectoryItemArray(res.fromInventoryStatuses);
+						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+						this.openScanPopup();
+					} else {
+						this.showErrorMessage(res.message)
+					}
 				});
 			},
-			showRequestPopup() {
-				this.$refs.comRepleinshRequestPopup.openRequestPopup();
+			getBalance(label, packageInfo, callback) {
+				var filters = []
+
+				if (packageInfo.parentNumber) {
+					var packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
+					filters.push({
+						column: "packingNumber",
+						action: "in",
+						value: packingNumber
+					})
+				} else {
+					filters.push({
+						column: "packingNumber",
+						action: "==",
+						value: label.packingNumber
+					})
+				}
+
+				filters.push({
+					column: "itemCode",
+					action: "==",
+					value: label.itemCode
+				})
+				filters.push({
+					column: "batch",
+					action: "==",
+					value: label.batch
+				})
+
+				if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") {
+					filters.push({
+						column: "inventoryStatus",
+						action: "in",
+						value: this.fromInventoryStatuses
+					})
+				}
+
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getBalanceByFilter(params).then(res => {
+					callback(res.data)
+				}).catch(err => {
+					this.showErrorMessage(err.message);
+				})
 			},
 
-			//确定需求信息
-			requestConfirm(action, item) {
-				if (item.itemCode == '' || item.itemCode == null) return;
+			getScanResult(result) {
 				let that = this;
-				let request = that.requestList.find(r => r.itemCode == item.itemCode);
-				if (request == undefined) {
-					that.requestList.push(item);
-					this.getRecommendInfo(item);
-
-				} else {
-					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
-						if (res) {
-							request.qty = item.qty;
-							that.detailSource.forEach(detail => {
-								let index = detail.Items.findIndex(r => {
-									r.itemCode == item.itemCode
-								})
-								detail.Items.splice(index, 1);
-							})
-							this.getRecommendInfo(item);
+				let pack = result.package;
+				if (that.recommendList.length > 0) {
+					let recommend = that.recommendList.filter(r => r.itemCode == pack.itemCode);
+					if (recommend.length == 0) {
+						this.showErrorMessage('物料代码【' + pack.itemCode + '】不在推荐列表中');
+					} else {
+						let batch = recommend.find(r => r.batch == pack.batch);
+						if (batch == undefined) {
+							that.showErrorMessage('扫描的批次【' + pack.batch + '】,不是系统推荐的批次,不满足系统的先进先出规则,请重新扫描物料');
+						} else {
+							this.setData(result);
 						}
-					});
+					}
+				} else {
+					this.getRecommendInfo(result);
 				}
 			},
 
-			getRecommendInfo(item) {
+			getRecommendInfo(result) {
 				let that = this;
 				uni.showLoading({
 					title: '加载中...',
 					mask: true
 				})
-				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+				let item = {
+					itemCode: result.package.itemCode,
+					qty: result.package.qty,
+				}
+				getBalanceByBatchOffShelf(item.itemCode, item.qty, "Repleinment").then(res => {
 					if (res.data == null) {
-						that.showMessage('未获取到推荐信息');
+						that.showErrorMessage('未获取到推荐信息');
 					} else {
 						if (res.data.length > 0) {
-							res.data.forEach(r => {
-								r.toLocationCode = item.toLocation.code;
-								r.itemName = item.itemName
-								r.uom = item.uom;
-								that.subList.push(r);
-							})
-
-							that.detailSource = getDataSource(that.detailSource, that.subList)
-							//要修改一下数量
-							that.detailSource.forEach(detail => {
-								detail.Items.forEach(i => {
-									let request = that.requestList.find(r => r
-										.itemCode == i
-										.itemCode);
-									i.qty = request.qty;
-								})
-							})
-							// that.resizeCollapse();
+							that.recommendList = res.data;
+							that.recommendList.forEach(r => r.locationCode = r.fromLocationCode)
+							let recommendInfo = res.data[0];
+							if (recommendInfo.batch != result.package.batch) {
+								that.showErrorMessage('扫描的批次【' + result.package.batch + '】,不是系统推荐的批次【' +
+									recommendInfo.batch + '】,不满足系统的先进先出规则,请重新扫描');
+							} else {
+								this.setData(result);
+							}
 						} else {
-							that.showMessage('列表数据为0');
+							that.showErrorMessage('未查找到物料的推荐信息');
 						}
 						uni.hideLoading();
 					}
@@ -226,76 +276,98 @@
 				})
 			},
 
-
-			caclcQty() {
-				var totalQty = 0;
-				this.detailSource.subList.forEach(res => {
-					totalQty = calc.add(totalQty, res.qty)
-				})
-				this.detailSource.totalQty = totalQty;
-			},
-
-			openScanDetailPopup() {
-				var datacontent = {}
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				// Object.assign(datacontent, this.detailSource);
-				var dataContent = {
-					allowModifyPackingNumber: "FALSE",
-					outInventoryStatuses: this.fromInventoryStatuses
+			setData(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
+					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
+						.fromLocationCode + "]没有库存余额")
+					return;
 				}
-				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
-			},
 
-			closeScanPopup() {
-				this.updateCommitBtn();
-			},
-
-			updateData(record) {
-				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
-				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
-				let itemHandleQty = 0;
-				if (item != undefined) {
-					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == null || b.packingNumber == '') && b.batch ==
-							record.batch);
-						let handleQty = 0;
-						if (batch != undefined) {
-							batch.Records.forEach(res => {
-								handleQty = calc.add(handleQty, res.qty)
-							})
-							batch.handleQty = handleQty;
-							itemHandleQty = calc.add(itemHandleQty, handleQty)
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					if (this.itemCode != "" && this.itemCode != balance.itemCode) {
+						this.showErrorMessage("请扫描物料为【" + this.itemCode + "】的箱码")
+						return;
+					}
+					if (this.fromWarehouseCode == '') {
+						this.fromWarehouseCode = balance.warehouseCode;
+					}
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					newDetail.parentNumber = pack.parentNumber;
+					newDetail.packingNumber = pack.number
+					newDetail.packUnit = pack.packUnit;
+					newDetail.packQty = pack.packQty;
+					if (balance.lableQty) {
+						newDetail.handleQty = balance.lableQty
+					}
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+					this.itemCode = balance.itemCode;
+					this.fromLocationCode = balance.locationCode
+					this.scanPopupGetFocus()
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == pack.number &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
 						}
 					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						newDetail.parentNumber = pack.parentNumber;
+						newDetail.packingNumber = pack.number
+						newDetail.packUnit = pack.packUnit;
+						newDetail.packQty = pack.packQty;
+						if (balance.lableQty) {
+							newDetail.handleQty = balance.lableQty
+						}
+						item.subList.push(newDetail);
+						this.scanPopupGetFocus()
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + detail.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
 				}
-				this.resizeCollapse();
-				// item.handleQty=itemHandleQty;
-				// this.closeScan();
+				calcHandleQty(this.detailSource);
 			},
 
+
+
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.scanPopupGetFocus()
 					}
 				});
 			},
 
-			calcHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
-						}
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
 					}
 				}
 				this.$forceUpdate();
+
 			},
 
 			removeItem(index, item) {
 				this.detailSource.splice(index, 1)
+				this.updateData();
 			},
 
 			removePack() {
@@ -309,169 +381,142 @@
 			},
 
 			openScanPopup() {
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+				if (this.businessType) {
+					this.$refs.scanPopup.openScanPopup(this.businessType);
+				} else {
+					this.getBusinessType()
+				}
 			},
 
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
-				})
-
-			},
 
 			closeScanPopup() {
-				if (this.$refs.scanPopup != undefined) {
+				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.closeScanPopup();
 				}
 			},
 
 			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
+				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.getfocus();
 				}
 			},
 
-			submit() {
-				if(this.getScanCount()==0){
-					this.showErrorMessage("当前扫描数为0,请先扫描在提交");
-					return 
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+			},
+
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showMessage("请输入目标库位")
+					return;
+				}
+
+
+				if (this.detailSource.length == 0) {
+					this.showMessage("请扫描要发货的物料")
+					return;
 				}
+
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = this.toLocationCode
+						detail.fromLocation = this.fromLocationCode
+					})
+				})
+
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
 
-				//目前任务只到一个库位
-				var itemCodes = []
-				let locationCode = this.detailSource[0].toLocationCode
-				this.detailSource.forEach(toLocation => {
-					toLocation.Items.forEach(item => {
-						itemCodes.push(item.itemCode)
-					})
-				})
-
-				//获取管理模式，封装参数
-				getManagementPrecisions(itemCodes, locationCode, res => {
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
 					if (res.success) {
 						this.managementList = res.list;
-						this.submitJob();
+						var params = this.setRecordParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						repleinshRecordSubmit(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();
 						this.showErrorMessage(res.message);
 					}
 				});
-
 			},
 
-			submitJob() {
-				var params = this.setParams()
-				console.log("提交参数", JSON.stringify(params));
-				repleinshRecordSubmit(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() {
+
+			setRecordParams() {
 				var subList = []
-				var createTime = getCurrDateTime();
 				var creator = this.$store.state.user.id
-				this.detailSource.forEach(toLocationCode => {
-					toLocationCode.Items.forEach(item => {
-						item.Locations.forEach(fromLocation => {
-							fromLocation.Batchs.forEach(batch => {
-								let subItem = batch.detail;
-								subItem.recordList = [];
-
-								if (batch.Records.length > 0) {
-									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
-											.inventoryStatus;
-										record.toLocationCode = subItem
-											.toLocationCode;
-										record.fromLocationCode = fromLocation
-											.fromLocationCode
-										record.supplierCode = r.supplierCode;
-
-										//使用在途库不改变管理模式
-										var info = getPackingNumberAndBatch(
-											this.managementList, r
-											.itemCode,
-											r.packingNumber, r
-											.batch);
-										record.toPackingNumber = info
-											.packingNumber;
-										record.toBatch = info.batch;
-										subItem.recordList.push(record);
-									})
-									subList.push(subItem);
-								}
-							})
-						})
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							submitItem.qty = detail.handleQty;
+							submitItem.package = "";
+							submitItem.recordList = [{
+								toInventoryStatus: detail.inventoryStatus,
+								fromPackingNumber: info.packingNumber,
+								fromParentPackingNumber: detail.parentNumber,
+								fromBatch: info.batch,
+
+								toPackingNumber: info.packingNumber,
+
+								toBatch: info.batch,
+								fromLocationCode: detail.locationCode,
+								toLocationCode: detail.toLocationCode,
+								handleQty: detail.handleQty,
+								fromPackUnit: detail.packUnit,
+								toPackUnit: detail.packUnit,
+								fromPackQty: detail.packQty,
+								toPackQty: detail.packQty
+							}]
+							subList.push(submitItem)
+						}
 					})
 				})
-
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
 				this.dataContent.subList = subList
-				this.dataContent.createTime = createTime;
 				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
 				return this.dataContent;
 			},
-			
-			getScanCount(){
-				var scanCount = 0;
-				var subList = []
-				this.detailSource.forEach(toLocationCode => {
-					toLocationCode.Items.forEach(item => {
-						item.Locations.forEach(fromLocation => {
-							fromLocation.Batchs.forEach(batch => {
-								let subItem = batch.detail;
-								subItem.recordList = [];
-				
-								if (batch.Records.length > 0) {
-									batch.Records.forEach(r => {
-										let record = {};
-										record.handleQty = r.qty;
-										subItem.recordList.push(record);
-									})
-									subList.push(subItem);
-								}
-							})
-						})
-					})
-				})
-				return scanCount =subList.length;
-			},
-			
 
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {}
 				});
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
@@ -484,75 +529,34 @@
 			closeScanMessage() {
 				this.scanPopupGetFocus();
 			},
-			getLocation(location, code) {
-				this.getToLocationCode(location, code)
-			},
-			getFromLocationCode(location, code) {
-				this.fromLocationCode = code;
-				this.openScanPopup();
-			},
 			getToLocationCode(location, code) {
-				// if (this.fromLocationCode == code) {
-				// 	uni.showToast({
-				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
-				// 		duration: 2000
-				// 	})
-				// 	return
-				// }
-				this.ToLocationCodeInfo = location;
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
 				this.toLocationCode = code;
 			},
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData();
+					this.clear();
 				})
 			},
-			clearData() {
+
+			clear() {
 				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
 				this.detailSource = [];
-				this.requestList = [];
-				this.dataContent = {}
-				this.managementList = []
-			},
-
+				this.toLocationCode = "";
+				this.itemCode = ""
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/repleinsh/record/repleinshRecordV1.vue b/src/pages/repleinsh/record/repleinshRecordV1.vue
new file mode 100644
index 00000000..8a1fab48
--- /dev/null
+++ b/src/pages/repleinsh/record/repleinshRecordV1.vue
@@ -0,0 +1,558 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showRequestPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(toLocation, index) in detailSource" :key="index">
+						<view class="">
+							<view class="page-header">
+								<view class="text_lightblue fontsize-16">目标库位:{{toLocation.toLocationCode}}</view>
+							</view>
+							<com-issue-detail-card ref='comRepleinshDetailCard' :dataContent="toLocation"
+								@updateData='updateData'>
+							</com-issue-detail-card>
+						</view>
+						<!-- <view class='split_line'></view> -->
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<com-repleinsh-request-popup ref="comRepleinshRequestPopup" :toLocationAreaTypeList="toLocationAreaTypeList"
+			@confirm='requestConfirm'
+			:itemCodeTypeList="itemCodeTypeList">
+		</com-repleinsh-request-popup>
+		<win-scan-button v-if='detailSource.length>0' @goScan='openScanDetailPopup'></win-scan-button>
+		<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</com-scan-issue-pack>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		repleinshRecordSubmit,
+		getBalanceByBatchOffShelf
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatch
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getBusinessType,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comBlankView,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			comRepleinshRequestPopup,
+			comIssueDetailCard,
+			comScanIssuePack
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				businessTypeInfo: {},
+				fromLocationCode: "",
+				toLocationCode: "",
+				toLocationAreaTypeList: [],
+				allowModifyLocation: false,
+				businessType: {},
+				requestList: [],
+				managementList: [],
+				dataContent: {},
+				itemCodeTypeList:[]
+			};
+		},
+		onLoad(option) {
+			var typeCode = "Repleinment"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.itemCodeTypeList = res.itemCodeTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					this.showRequestPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			closeScan() {
+				this.resizeCollapse();
+			},
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comRepleinshDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+			showRequestPopup() {
+				this.$refs.comRepleinshRequestPopup.openRequestPopup();
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+				if (item.itemCode == '' || item.itemCode == null) return;
+				let that = this;
+				let request = that.requestList.find(r => r.itemCode == item.itemCode);
+				if (request == undefined) {
+					that.requestList.push(item);
+					this.getRecommendInfo(item);
+
+				} else {
+					this.$refs.comMessage.showQuestionMessage('已经存在物料[' + item.itemCode + ']的需求信息,是否要修改?', res => {
+						if (res) {
+							request.qty = item.qty;
+							that.detailSource.forEach(detail => {
+								let index = detail.Items.findIndex(r => {
+									r.itemCode == item.itemCode
+								})
+								detail.Items.splice(index, 1);
+							})
+							this.getRecommendInfo(item);
+						}
+					});
+				}
+			},
+
+			getRecommendInfo(item) {
+				let that = this;
+				uni.showLoading({
+					title: '加载中...',
+					mask: true
+				})
+				getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+					if (res.data == null) {
+						that.showMessage('未获取到推荐信息');
+					} else {
+						if (res.data.length > 0) {
+							res.data.forEach(r => {
+								r.toLocationCode = item.toLocation.code;
+								r.itemName = item.itemName
+								r.uom = item.uom;
+								that.subList.push(r);
+							})
+
+							that.detailSource = getDataSource(that.detailSource, that.subList)
+							//要修改一下数量
+							that.detailSource.forEach(detail => {
+								detail.Items.forEach(i => {
+									let request = that.requestList.find(r => r
+										.itemCode == i
+										.itemCode);
+									i.qty = request.qty;
+								})
+							})
+							// that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+						uni.hideLoading();
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					that.showErrorMessage(error)
+				})
+			},
+
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty = calc.add(totalQty, res.qty)
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				var dataContent = {
+					allowModifyPackingNumber: "FALSE",
+					outInventoryStatuses: this.fromInventoryStatuses
+				}
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, dataContent);
+			},
+
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == null || b.packingNumber == '') && b.batch ==
+							record.batch);
+						let handleQty = 0;
+						if (batch != undefined) {
+							batch.Records.forEach(res => {
+								handleQty = calc.add(handleQty, res.qty)
+							})
+							batch.handleQty = handleQty;
+							itemHandleQty = calc.add(itemHandleQty, handleQty)
+						}
+					})
+				}
+				this.resizeCollapse();
+				// item.handleQty=itemHandleQty;
+				// this.closeScan();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty,detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			submit() {
+				if(this.getScanCount()==0){
+					this.showErrorMessage("当前扫描数为0,请先扫描在提交");
+					return 
+				}
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource[0].toLocationCode
+				this.detailSource.forEach(toLocation => {
+					toLocation.Items.forEach(item => {
+						itemCodes.push(item.itemCode)
+					})
+				})
+
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", JSON.stringify(params));
+				repleinshRecordSubmit(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() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+
+								if (batch.Records.length > 0) {
+									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
+											.inventoryStatus;
+										record.toLocationCode = subItem
+											.toLocationCode;
+										record.fromLocationCode = fromLocation
+											.fromLocationCode
+										record.supplierCode = r.supplierCode;
+
+										//使用在途库不改变管理模式
+										var info = getPackingNumberAndBatch(
+											this.managementList, r
+											.itemCode,
+											r.packingNumber, r
+											.batch);
+										record.toPackingNumber = info
+											.packingNumber;
+										record.toBatch = info.batch;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.createTime = createTime;
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			
+			getScanCount(){
+				var scanCount = 0;
+				var subList = []
+				this.detailSource.forEach(toLocationCode => {
+					toLocationCode.Items.forEach(item => {
+						item.Locations.forEach(fromLocation => {
+							fromLocation.Batchs.forEach(batch => {
+								let subItem = batch.detail;
+								subItem.recordList = [];
+				
+								if (batch.Records.length > 0) {
+									batch.Records.forEach(r => {
+										let record = {};
+										record.handleQty = r.qty;
+										subItem.recordList.push(record);
+									})
+									subList.push(subItem);
+								}
+							})
+						})
+					})
+				})
+				return scanCount =subList.length;
+			},
+			
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getToLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				// if (this.fromLocationCode == code) {
+				// 	uni.showToast({
+				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+				// 		duration: 2000
+				// 	})
+				// 	return
+				// }
+				this.ToLocationCodeInfo = location;
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData() {
+				this.fromLocationCode = '';
+				this.detailSource = [];
+				this.requestList = [];
+				this.dataContent = {}
+				this.managementList = []
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>