diff --git a/api/request2.js b/api/request2.js
index dc99bdff..e1b48b61 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -373,6 +373,16 @@ export function getWorkShopLineStation() {
 	});
 }
 
+/**
+ * 查询客户物品
+ */
+export function getCustomerItemList(params) {
+	return request({
+		url: baseApi + "/wms/customeritem/senior",
+		method: "post",
+		data: params,
+	});
+}
 
 
 
diff --git a/mycomponents/balance/recommendBalance.vue b/mycomponents/balance/recommendBalance.vue
index ef40ad8d..443293b6 100644
--- a/mycomponents/balance/recommendBalance.vue
+++ b/mycomponents/balance/recommendBalance.vue
@@ -1,14 +1,14 @@
 <template>
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
-		<view class="uni-flex uni-row space-between uni-inline-item">
-			<view class="uni-flex uni-row  uni-inline-item">
-				<view style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
+		<view class="uni-flex uni-row space-between ">
+			<view class="uni-flex uni-row  ">
+				<view class="center" style=" width: 20px;color: #32C1E8;">
 					推荐
 				</view>
-				<view>
-					<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<view class="center">
+					<!-- <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack> -->
 					<batch v-if="isShowBatch" :batch="detail.batch"></batch>
-					<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+					<!-- <location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location> -->
 				</view>
 			</view>
 			<view>
diff --git a/mycomponents/job/jobBottom.vue b/mycomponents/job/jobBottom.vue
index 120265e5..46e9ad60 100644
--- a/mycomponents/job/jobBottom.vue
+++ b/mycomponents/job/jobBottom.vue
@@ -8,7 +8,7 @@
 			</view>
 			<view class="uni-flex uni-row  u-col-center">
 				<image class="card_icon_normal" src="/static/icons/icon_date.svg" alt="" />
-				<text>{{formatDate(dataContent.createTime)}}</text>
+				<text class="center">{{formatDate(dataContent.createTime)}}</text>
 			</view>
 		</view>
 	</view>
diff --git a/mycomponents/popup/selectList.vue b/mycomponents/popup/selectList.vue
index 998412ec..a5069733 100644
--- a/mycomponents/popup/selectList.vue
+++ b/mycomponents/popup/selectList.vue
@@ -31,7 +31,8 @@
 <script>
 	
 	import {
-		getProductionlineItem
+		getProductionlineItem,
+		getCustomerItemList
 	} from '@/api/request2.js';
 	import comPopup from '@/mycomponents/common/comPopup.vue'
 	export default {
@@ -53,15 +54,23 @@
 		},
 		methods: {
 			queryList(lineCode){
+				var filters =[]
+				filters.push({
+					column: "customerCode",
+					action: "==",
+					value: lineCode
+				})
+				
 				var params = {
-					productionLineCode: lineCode,
+					filters: filters,
 					pageNo: this.pageCurrent,
-					pageSize: this.pageSize
+					pageSize: this.pageSize,
 				}
-				getProductionlineItem(params).then(res => {
+				getCustomerItemList(params).then(res => {
 					if (res.data != null && res.data.list.length > 0) {
 						this.showList = res.data.list;
-						this.total =res.data.total;
+						this.total = res.data.total;
+						this.$forceUpdate()
 						this.$refs['popupItems'].open("center");
 					} else {
 						//没有查询到生产线对应的零件信息
diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue
index 9e6755fc..46780f13 100644
--- a/mycomponents/record/recordComDetailCard.vue
+++ b/mycomponents/record/recordComDetailCard.vue
@@ -141,7 +141,6 @@
 
 			edit(item) {
 				this.editItem = item;
-				debugger
 				this.$refs.balanceQtyEdit.openEditPopup(this.editItem, this.editItem.qty);
 			},
 
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 829dce48..8e91fa81 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -117,6 +117,7 @@
 				} else {
 					this.locationGetFocus();
 				}
+				this.fromInventoryStatuses = this.businessType.outInventoryStatuses
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
 				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
 				this.$refs.popup.open('bottom');
diff --git a/pages.json b/pages.json
index 7ea1b5be..3f177557 100644
--- a/pages.json
+++ b/pages.json
@@ -1422,6 +1422,15 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/deliver/request/deliverRequestCreate",
+			"style": {
+				"navigationBarTitleText": "成品发货申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
+		
+		
 
 		{
 			"path": "pages/customerReturn/job/returnJob",
diff --git a/pages/deliver/coms/comDeliverRequestCreator.vue b/pages/deliver/coms/comDeliverRequestCreator.vue
new file mode 100644
index 00000000..3fa70302
--- /dev/null
+++ b/pages/deliver/coms/comDeliverRequestCreator.vue
@@ -0,0 +1,87 @@
+<template>
+	<view class="">
+
+
+		<uni-collapse ref="collapse">
+			<uni-collapse-item :open="true">
+				<template v-slot:title>
+					<view class="" style="font-size: 32rpx;">
+						<view class="" >
+							客户 : {{dataContent.customerName}} ({{dataContent.customerCode}})
+						</view>
+						
+						<view class="">
+							总数量 : {{dataContent.totalQty}} 
+						</view>
+					</view>
+					
+				</template>
+				<u-line />
+				<uni-swipe-action ref="swipeAction">
+					<view v-for="(item, index) in dataContent.subList" :key="index">
+						<uni-swipe-action-item>
+							<view class="" style="font-size: 32rpx;margin: 10rpx;">
+								<view class="">
+									物品代码 : {{item.itemCode}}
+								</view>
+								<view class="">
+									物品名称 : {{item.itemName}}
+								</view>
+								
+								<view class="uni-flex uni-row uni-center">
+									<view class="">
+										数量 : {{item.qty}} 单位 : 
+									</view>
+									<view class="">
+										<uom :uom="item.uom"></uom>
+									</view>
+									
+								</view>
+
+							</view>
+						</uni-swipe-action-item>
+						<u-line />
+					</view>
+				</uni-swipe-action>
+
+			</uni-collapse-item>
+		</uni-collapse>
+
+
+	</view>
+</template>
+
+<script>
+	import uom from '@/mycomponents/qty/uom.vue'
+	export default {
+		components: {
+			uom
+		},
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+		methods: {
+			update(){
+				this.$nextTick(r => {
+					this.$refs.collapse.resize()
+				});
+			}
+
+
+
+
+
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/deliver/coms/comDeliverRequestPopup.vue b/pages/deliver/coms/comDeliverRequestPopup.vue
new file mode 100644
index 00000000..474c39f2
--- /dev/null
+++ b/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -0,0 +1,272 @@
+<template>
+	<view class="">
+		<uni-popup ref="popup" :maskClick="false">
+			<view class="uni-flex uni-column pop_customer">
+				<view class="" style="padding:10rpx">
+					<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
+						<view class="" style="font-size: 35rpx;">
+							{{title}}
+						</view>
+						<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
+							@click="closeRequestPopup()"></image>
+					</view>
+					<u-line />
+					<view class="uni-flex uni-column" style="background-color: white; ">
+						<view class="uni-flex uni-column  ">
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>客户 : </text>
+								<view class="uni-flex u-col-center uni-row" @click="showSelect">
+									<view class="" style="margin-left: 20rpx;">
+										{{customerName}}
+									</view>
+									<u-select v-model="showCustomer" mode="single-column" :list="customerList"
+										@confirm="confirmSelect"></u-select>
+								</view>
+					
+							</view>
+							<u-line />
+					
+							<view class="uni-flex uni-row padding title u-col-center">
+								<text>零件 : </text>
+								<view class="uni-flex u-col-center uni-row">
+									<u-input v-model="itemCode" :focus="itemCodeFocus" :border="true"
+										placeholder="请输入需求零件" @confirm="itemCodeConfirm" />
+									<image src="/static/search.svg" mode=""
+										style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick">
+									</image>
+					
+								</view>
+							</view>
+							<u-line />
+					
+							<view class="uni-flex uni-row  padding title u-col-center">
+								<text>数量 : </text>
+								<view class="uni-flex uni-row uni-center"
+									style="align-items: center;margin-left: 20rpx;">
+									<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
+										:focus="numberFocus" @blur='numberFocus = false'>
+									</uni-number-box>
+									<uom :uom="uom"></uom>
+					
+								</view>
+							</view>
+							<u-line />
+						</view>
+					</view>
+				</view>
+				<view class="uni-flex uni-row hide_border">
+					<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
+					<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+
+		<comMessage ref="comMessage"></comMessage>
+		<selectList ref='selectList' @selectedItem="selectedItem"></selectList>
+	</view>
+</template>
+
+<script>
+	import {
+		getBasicLocationByCode,
+		getBasicItemByCode,
+		getProductionlineItem,
+		getWorkShopLineStation,
+		getBasicCustomerList,
+	} from '@/api/request2.js';
+	import {
+		getLocationTypeName,
+		getListLocationTypeDesc,
+		checkDirectoryItemExist
+	} from '@/common/directory.js';
+	import uom from '@/mycomponents/qty/uom.vue'
+	import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import selectList from '@/mycomponents/popup/selectList.vue'
+
+
+	export default {
+		components: {
+			uom,
+			balanceStatus,
+			comMessage,
+			selectList
+		},
+		data() {
+			return {
+				// itemCode: 'CE115F11161AG',
+				itemCode: '',
+				itemName: "",
+				qty: 0,
+				itemCodeFocus: false,
+				requestInfo: null,
+				itemCodeList: [],
+				isCheckItemCode: false,
+				counQty: 0,
+				editPosition: true,
+				numberFocus: false,
+				uom: "",
+				showCustomer: false,
+				isModifiedPosition: true,
+				customerList: [],
+				customerName: "请选择客户",
+				customerCode:""
+			}
+		},
+		props: {
+			title: {
+				type: String,
+				default: '需求信息'
+			},
+		},
+		methods: {
+			openRequestPopup(editPosition) {
+				if (this.customerList.length == 0) {
+					getBasicCustomerList().then(res => {
+						if (res.data.length > 0) {
+							var list = res.data;
+							list.forEach(item => {
+								item.label = item.name
+								item.value = item.code
+							})
+							this.customerList = list;
+						}
+					}).catch(error => {
+
+					})
+				}
+
+				this.editPosition = editPosition;
+				if (this.isModifiedPosition) {
+					this.isModifiedPosition = false
+				} else {
+					this.itemCode = "";
+					this.uom = ""
+					this.qty = 0
+					this.itemCodeGetFocus();
+				}
+
+				this.$refs.popup.open('bottom')
+			},
+			closeRequestPopup() {
+				this.$refs.popup.close()
+			},
+			locationConfirm() {
+				//查询库位信息
+				this.checkLocatioCode();
+			},
+			itemCodeClick() {
+				if (this.customerName == "请选择客户") {
+					this.showErrorMessage("请选择客户")
+					return
+				}
+				this.$refs.selectList.queryList(this.customerCode)
+
+			},
+
+			itemCodeGetFocus() {
+				this.itemCodeFocus = true;
+			},
+			itemCodeLoseFocus() {
+				this.itemCodeFocus = false;
+			},
+			selectedItem(item) {
+				this.itemCode = item.itemCode;
+				this.checkItemCode();
+			},
+
+			confirm() {
+				if (this.itemCode == "" || !this.isCheckItemCode) {
+					this.showErrorMessage("请输入零件", "itemCode")
+					return
+				}
+				if (this.qty == 0) {
+					this.showErrorMessage("数量必须大于0")
+					return
+				}
+
+				this.callback('add');
+
+			},
+			
+			confirmSelect(e){
+				this.customerName = e[0].label
+				this.customerCode = e[0].value
+			},
+
+			checkItemCode() {
+				//校验零件
+				getBasicItemByCode(this.itemCode).then(res => {
+					uni.hideLoading();
+					if (res.data != null && res.data.list.length > 0) {
+						this.itemCode = res.data.list[0].code;
+						this.itemName = res.data.list[0].name
+						this.isCheckItemCode = true;
+						this.numberFocus = true
+						this.uom = res.data.list[0].uom
+					} else {
+						this.showErrorMessage('未查找到零件【' + this.itemCode + '】', "itemCode");
+					}
+
+				}).catch(error => {
+					uni.hideLoading();
+					this.showErrorMessage(error, "itemCode");
+				})
+			},
+
+
+			callback(action) {
+				let item = {
+					customerName :this.customerName,
+					customerCode:this.customerCode,
+					itemCode: this.itemCode,
+					itemName: this.itemName,
+					uom: this.uom,
+					qty: this.qty
+				};
+				this.closeRequestPopup();
+				this.$emit("confirm", action, item);
+			},
+
+			showErrorMessage(message, type) {
+				setTimeout(r => {
+					this.$refs.comMessage.showErrorMessage(message, res => {
+						if (type == "itemCode") {
+							this.itemCodeGetFocus();
+						} else {
+							this.numberFocus = true;
+						}
+					})
+					if (type == "itemCode") {
+						this.itemCode = ""
+						this.isCheckItemCode = false;
+					}
+				})
+			},
+			itemCodeConfirm() {
+				this.checkItemCode();
+			},
+			change(value) {
+				this.qty = value;
+			},
+			cancel(e) {
+				this.closeRequestPopup();
+			},
+			showSelect() {
+				if (this.editPosition) {
+					this.showCustomer = true
+				}
+
+			},
+		
+
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 30rpx;
+	}
+</style>
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
index 338dcbde..7dbe4113 100644
--- a/pages/deliver/record/deliverRecord.vue
+++ b/pages/deliver/record/deliverRecord.vue
@@ -8,7 +8,7 @@
 				<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="jobContent"
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
 								@removePack="removePack">
 							</record-com-detail-card>
@@ -32,6 +32,9 @@
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
+						<requiredLocation v-if="showToLoaction" ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+							@getLocation='scanLocationCode' :isShowEdit="true"
+							:locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -101,27 +104,23 @@
 				received: false,
 				isShowPackingCode: true,
 				scanCount: 0,
-				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				locationTypeList: [],
-				toLocationInfo: {},
 				businessTypeInfo: {},
 				fromLocationInfo: {},
 				fromLocationCode: "",
-				toLocationInfo: {},
 				toLocationCode: "",
 				isShowLocation: false,
 				fromlocationTypeList: [],
 				tolocationTypeList: [],
 				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
 				customerList: [],
 				customer: "",
 				fromType: "",
-				showToLoaction: true
+				showToLoaction: true,
+				dataContent:{}
 			};
 		},
 		onLoad(option) {
@@ -168,8 +167,10 @@
 		methods: {
 			updateTitle() {
 				if (this.fromType == "requestType") {
+					this.showToLoaction = false
 					updateTitle("制品发货申请")
 				} else {
+					this.showToLoaction = true
 					updateTitle("制品发货记录")
 				}
 			},
@@ -179,14 +180,18 @@
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
+				let labelQty =result.label.qty;
+				let balanceQty =result.balance.qty;
 				var item = this.detailSource.find(res => {
 					if (res.itemCode == balance.itemCode) {
 						return res
 					}
 				})
+				var qty =labelQty>balanceQty?balanceQty:labelQty
 				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
+					var itemp = createItemInfo(qty, pack);
 					let newDetail = createDetailInfo(balance, pack); //
+					if(labelQty)
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -246,6 +251,17 @@
 				}
 				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
 			},
+			
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+			},
 			showFromLocationPopup() {
 				this.$nextTick(() => {
 					this.$refs.scanLocationCode.openScanPopup();
@@ -278,19 +294,19 @@
 					return;
 				}
 				console.log("客户", this.customer)
-				if (this.toLocationCode == "") {
+				if (this.toLocationCode == ""&&this.showToLoaction) {
 					this.showMessage("请先选择目标库位")
 					return;
 				}
-				//允许部分提交
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
 
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
+				
 				if (this.fromType == "requestType") {
+					var params = this.setRequestParams();
+					console.log("提交" + JSON.stringify(params))
 					// deliverRequestSubmit(params).then(res => {
 					// 	uni.hideLoading()
 					// 	if (res.data) {
@@ -325,8 +341,6 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							// var subItem = {};
-							// Object.assign(subItem, detail)
 							detail.toPackingNumber = detail.packingNumber;
 							detail.toContainerNumber = detail.containerNumber
 							detail.toBatch = detail.toBatch;
@@ -337,9 +351,47 @@
 						}
 					})
 				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				return this.dataContent;
+			},
+			
+			setRequestParams(){
+				var subList = []
+				var supplierCode=""
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.soNumber =detail.package.soNumber;
+							detail.soLine = detail.soLine.soNumber;
+							// soNumber: 926926926,
+							// soLine: 926,
+							// itemCode: THILDD0A691AG,
+							// remark: ,
+							// qty: 2,
+							// uom: EA
+							subList.push(detail)
+						}
+					})
+				})
+				
+					this.dataContent.subList = subList
+				    this.dataContent.deliverPlanNumber = "DP20231130-0001"
+					this.dataContent.customerCode = "CF"
+					this.dataContent.customerDockCode = ""
+					this.dataContent.carrierCode = ""
+					this.dataContent.transferMode = ""
+					this.dataContent.vehiclePlateNumber = ""
+					this.dataContent.remark = ""
+					this.dataContent.dueTime = ""
+					this.dataContent.departmentCode = "研发部门"
+					this.dataContent.status = 1
+					this.dataContent.autoCommit = "FALSE"
+					this.dataContent.autoAgree = "FALSE"
+					this.dataContent.autoExecute = "FALSE"
+					this.dataContent.directCreateRecord = "FALSE"
+				
+				return this.dataContent;
 			},
 
 			showMessage(message) {
diff --git a/pages/deliver/request/deliverRequest.vue b/pages/deliver/request/deliverRequest.vue
index fd05e66b..2554664d 100644
--- a/pages/deliver/request/deliverRequest.vue
+++ b/pages/deliver/request/deliverRequest.vue
@@ -193,7 +193,7 @@
 
 			openScanDetailPopup() {
 				uni.navigateTo({
-					url: "../record/deliverRecord?fromType=" + this.fromType
+					url: "./deliverRequestCreate"
 				})
 			},
 
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
new file mode 100644
index 00000000..76134316
--- /dev/null
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -0,0 +1,222 @@
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.subList.length==0'>
+			<com-blank-view @goScan='goScan(true)'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<comDeliverRequestCreator ref="deliverRequest" :dataContent="detailSource">
+				</comDeliverRequestCreator>
+				<button class="btn_add" @click="goScan(false)">+去添加</button>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<comDeliverRequestPopup ref="comDeliverRequestPopup" @confirm='requestConfirm'></comDeliverRequestPopup>
+</template>
+
+<script>
+	import {
+		deliverRequestSubmit,
+		issueRecordSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+		getRemoveOption,
+		getISODateTime
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comDeliverRequestPopup from '@/pages/deliver/coms/comDeliverRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comDeliverRequestCreator from '@/pages/deliver/coms/comDeliverRequestCreator.vue'
+
+	export default {
+		name: 'issueRequestSubmit',
+		components: {
+			comBlankView,
+			comDeliverRequestPopup,
+			jobDetailPopup,
+			comMessage,
+			comDeliverRequestCreator
+		},
+		data() {
+			return {
+				subList: [], //接口返回的任务subList
+				detailSource: {
+					subList: []
+				}, //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				fromType: "",
+				dataContent:{}
+
+			}
+		},
+		mounted() {
+			this.goScan(true)
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+
+		},
+		methods: {
+			goScan(editPosition) {
+				this.$refs.comDeliverRequestPopup.openRequestPopup(editPosition);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+
+				if (this.detailSource.subList.length == 0) {
+					this.detailSource = {
+						customerCode: item.customerCode,
+						customerName: item.customerName,
+						totalQty: 0,
+						subList: []
+					}
+					var subItem = {
+						itemCode: item.itemCode,
+						itemName: item.itemName,
+						qty: item.qty,
+						uom: item.uom
+					}
+					this.detailSource.subList.push(subItem)
+				} else {
+					var result = this.detailSource.subList.filter(res => {
+						if (res.itemCode == item.itemCode &&
+							res.productionLineCode == item.productionLineCode &&
+							res.workStationCode == item.workStationCode) {
+							return res
+						}
+					})
+
+					//没有添加数据
+					if (result.length == 0) {
+						var subItem = {
+							productionLineCode: item.productionLineCode,
+							productionLineName: item.productionLineName,
+							workStationCode: item.workStationCode,
+							workStationName: item.workStationName, //工位
+							itemCode: item.itemCode,
+							itemName: item.itemName,
+							qty: item.qty,
+							uom: item.uom
+						}
+
+						this.detailSource.subList.push(subItem)
+
+					} else {
+						//有了更新数据
+						result[0].qty += item.qty
+
+					}
+				}
+				this.caclcQty();
+				if (this.$refs.deliverRequest != undefined) {
+					this.$refs.deliverRequest.update()
+				}
+			},
+
+			caclcQty() {
+				var totalQty = 0;
+				this.detailSource.subList.forEach(res => {
+					totalQty += res.qty
+				})
+				this.detailSource.totalQty = totalQty;
+			},
+
+
+			setParams() {
+				return this.detailSource
+			},
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setRequestParams()
+				console.log("提交参数", JSON.stringify(params));
+				// deliverRequestSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		this.showCommitSuccessMessage("提交成功<br>生成成品发货申请" + res.data)
+				// 	} else {
+				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+
+			},
+			
+			setRequestParams(){
+				var subList = []
+				this.detailSource.subList.forEach(detail => {
+					debugger
+							detail.soNumber = detail.package.soNumber;
+							detail.soLine = detail.package.soLine;
+							detail.remark =""
+							// soNumber: 926926926,
+							// soLine: 926,
+							// itemCode: THILDD0A691AG,
+							// remark: ,
+							// qty: 2,
+							// uom: EA
+							subList.push(detail)
+				})
+				
+					this.detailSource.subList = subList
+				    this.detailSource.deliverPlanNumber = "DP20231130-0001"
+					this.detailSource.customerCode = this.detailSource.customerCode
+					this.detailSource.customerDockCode = ""
+					this.detailSource.carrierCode = ""
+					this.detailSource.transferMode = ""
+					this.detailSource.vehiclePlateNumber = ""
+					this.detailSource.remark = ""
+					this.detailSource.dueTime = ""
+					this.detailSource.departmentCode = "研发部门"
+					this.detailSource.status = 1
+					this.detailSource.autoCommit = "FALSE"
+					this.detailSource.autoAgree = "FALSE"
+					this.detailSource.autoExecute = "FALSE"
+					this.detailSource.directCreateRecord = "FALSE"
+				
+				return this.detailSource;
+			},
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					uni.navigateTo({
+						url: './deliverRequest'
+					})
+				})
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index d58afc09..d25a2be6 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -24,7 +24,7 @@
 							</view>
 							<view v-for="(batch,index) in loacation.Batchs">
 								<view>
-									<recommend-balance style='margin-left: 20px;' :detail="batch"
+									<recommend-balance style='margin-left: 20px;' :detail="batch" 
 										:isShowLocation="false" :isShowPack="false">
 									</recommend-balance>
 								</view>
@@ -34,13 +34,12 @@
 									<uni-swipe-action ref="swipeAction">
 										<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
 											:right-options="scanOptions">
-											<handle-balance style='margin-left: 40px;' :detail="record"
-												:isShowLocation="false" :isShowBatch="batch.packingNumber!=''">
+											<handle-balance style='margin-left: 40px;' :detail="record" 
+												:isShowLocation="false" :isShowBatch="batch.packingNumber!=null">
 											</handle-balance>
 										</uni-swipe-action-item>
 									</uni-swipe-action>
 								</view>
-								<u-line />
 							</view>
 						</view>
 					</view>
diff --git a/pages/issue/coms/comIssueJobCard.vue b/pages/issue/coms/comIssueJobCard.vue
index 24e20f4c..9226463b 100644
--- a/pages/issue/coms/comIssueJobCard.vue
+++ b/pages/issue/coms/comIssueJobCard.vue
@@ -1,11 +1,11 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
  		<view class="task_item">
+			<view class="task_text">
+				申请单号  {{dataContent.requestNumber}}
+			</view>
  			<view class="task_text">
- 				物品代码 : {{dataContent.itemCode}}
- 			</view>
- 			<view class="task_text">
- 				需求库位 : {{dataContent.toLocationCode}}
+ 				车间  {{dataContent.workShopCode}}
  			</view>
  		</view>
  	</job-com-main-card>
diff --git a/pages/issue/coms/comScanIssuePack.vue b/pages/issue/coms/comScanIssuePack.vue
index 11fd1462..4e7ebf06 100644
--- a/pages/issue/coms/comScanIssuePack.vue
+++ b/pages/issue/coms/comScanIssuePack.vue
@@ -13,8 +13,8 @@
 						margin-right: 20rpx;
 						padding:20rpx;
 						border-radius: 8rpx;">
-						<view class="uni-center" style="width: 25%; ">
-							位置 : 
+						<view class="uni-center">
+							位置 :
 						</view>
 						<view class="" style="width: 75%;padding: 0rpx">
 							<view class="uni-flex u-col-center uni-row" @click="showSelect">
@@ -140,8 +140,8 @@
 				scanOptions: {},
 				editItem: {},
 				positionInfo: "请选择位置",
-				positionList:[],
-				defaultValueList:[]
+				positionList: [],
+				defaultValueList: []
 			}
 		},
 		created() {
@@ -154,12 +154,12 @@
 		},
 		methods: {
 			openScanPopup(content, jobcontent) {
-				debugger
 				this.issueRecord = [];
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				this.positionInfo =this.jobContent.workShopCode+"-"+this.jobContent.subList[0].productionLineCode+"-"+this.jobContent.subList[0].workStationCode
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
 				this.$refs.popup.open('bottom');
 			},
 
@@ -171,7 +171,6 @@
 			},
 
 			initData() {
-				debugger
 				let that = this;
 				that.fromLocationList = [];
 				if (that.dataContent != null) {
@@ -210,7 +209,7 @@
 			onScan(result) {
 				try {
 					let that = this;
-					
+
 					if (that.fromLocationCode == '') {
 						that.showErrorMessage('请选择来源库位', res => {
 							that.$refs.toLocationCombox.onFocus();
@@ -237,19 +236,19 @@
 
 						getBalanceByManagementPrecision(result.label, that.fromLocationCode, balanceRes => {
 							if (balanceRes.success) {
-								if (balanceRes.Data.length == 0) {
+								if (balanceRes.data.list.length == 0) {
 									this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
 										res => {
 											this.packGetFocus();
 										})
-								} else if (balanceRes.Data.length == 1) {
-									let balance = balanceRes.Data[0];
+								} else if (balanceRes.data.list.length == 1) {
+									let balance = balanceRes.data.list[0];
 									this.afterGetBalance(result.label, balance);
 								} else {
-									this.showBalanceSelect(balanceRes.Data);
+									this.showBalanceSelect(balanceRes.data.list);
 								}
 							} else {
-								this.showErrorMessage(balanceRes.message);
+								this.showErrorMessage(balanceRes.message.message);
 							}
 							uni.hideLoading();
 						});
@@ -274,16 +273,18 @@
 							if (batch.Records == undefined) {
 								batch.Records = [];
 							}
+
 							let record = batch.Records.find(r => r.packingNumber == packingCode);
 							if (record == undefined) {
-								//有推荐箱码
-								if (batch.Recommends != undefined) {
+
+								//如果有推荐箱码
+								if (batch.Recommends.length > 0) {
 									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
 									if (recommend != undefined) {
 										that.addRecord(batch, label, balance)
 									} else {
 										//允许修改箱码
-										if (this.jobContent.AllowModifyPackingNumber) {
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
 											that.addRecord(batch, label, balance);
 										} else {
 											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index afbafc2f..9c108f25 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -176,12 +176,15 @@
 			submit() {
 				//3.如果是按批次先进先出发料提交时如果扫描的箱码不是先进的批次，则报错
 				//:请扫描XXX批次，改批次满足先进先出规则。否则可以直接提交
-				var isOutIn = getApp().globalData.feed_configList.filter(
-					res => {
-						if (res.name == 'feed_isOutIn') {
-							return res;
-						}
-					});
+				// var isOutIn = getApp().globalData.feed_configList.filter(
+				// 	res => {
+				// 		if (res.name == 'feed_isOutIn') {
+				// 			return res;
+				// 		}
+				// 	});
+				
+				
+				
 
 				this.dataContent.itemCodeList.forEach(res => {
 					if (res.handleQty > res.recommendQty) {
diff --git a/pages/issue/js/issue.js b/pages/issue/js/issue.js
index 979f49cd..2473229b 100644
--- a/pages/issue/js/issue.js
+++ b/pages/issue/js/issue.js
@@ -1,9 +1,9 @@
-export function getDataSource(list,subList) {
+export function getDataSource(list, subList) {
 	for (var i = 0; i < subList.length; i++) {
 		let detail = subList[i];
 		var location = list.find(r =>
 			r.toLocationCode == detail.toLocationCode)
-			
+
 		if (location == undefined) {
 			location = {
 				toLocationCode: detail.toLocationCode,
@@ -15,7 +15,7 @@ export function getDataSource(list,subList) {
 	}
 	return list;
 }
- 
+
 //树形结构:需求库位 -> 零件Items -> 库位 Locations-> 批次Batchs -> 记录Records
 export function createDetailInfo(location, detail) {
 	var item = location.Items.find(r =>
@@ -37,7 +37,7 @@ export function createDetailInfo(location, detail) {
 				let batch = createBatchInfo(detail);
 				location.Batchs.push(batch);
 			} else {
-				batch.recommends.push(detail);
+				batch.Recommends.push(detail);
 			}
 		}
 	}
@@ -47,8 +47,8 @@ export function createItemInfo(detail) {
 	let item = {
 		itemCode: detail.itemCode,
 		itemName: detail.itemName,
-		productionLineCode:detail.productionLineCode,
-		workStationCode:detail.workStationCode,
+		productionLineCode: detail.productionLineCode,
+		workStationCode: detail.workStationCode,
 		stdPackQty: detail.stdPackQty,
 		stdPackUnit: detail.stdPackUnit,
 		qty: detail.qty,
@@ -81,15 +81,14 @@ export function createBatchInfo(detail) {
 		qty: detail.qty,
 		uom: detail.uom,
 		handleQty: 0,
-		// Recommends: [detail],
-		// Records: []
+		Recommends: [],
+		Records: []
 	}
 
 	//推荐到了箱码和批次
-	if (detail.packingNumber != '') {
-		batch.Recommends = [detail];
+	if (detail.packingNumber != '' && detail.packingNumber != null) {
+		batch.Recommends.push(detail);
 	}
-
 	return batch;
 }
 
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 50382afb..d0aa5b87 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -321,6 +321,9 @@
 				})
 				
 				this.dataContent.subList = subList
+				this.dataContent.purchaseReceiptRecordNumber="";
+				this.transferMode ="";
+				
 				this.dataContent.supplierCode = supplierCode
 				this.dataContent.businessType = "PurchasePutaway"
 				this.dataContent.departmentCode= "研发部门";
diff --git a/static/config.json b/static/config.json
index 98262940..2f6ce912 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,8 +18,9 @@
 		
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.157:12080/admin-api",
+			"value": "http://192.168.0.178:12080/admin-api",
 			"dev2":"http://192.168.0.157:12080/admin-api",
+			"chefang":"http://192.168.0.178:12080/admin-api",
 			"dev":"http://dev.ccwin-in.com:25100/api/admin-api",
 			"local":"http://localhost:12080",
 			"desc": "api请求地址"