diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 3107abbf..d1a63a06 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -7,7 +7,7 @@
             <view class="" style="font-size: 35rpx"> 扫描箱码 </view>
 
             <view class="">
-              <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image>
+              <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"> </image>
             </view>
           </view>
           <view class="uni-flex uni-row" style="align-items: center; background-color: #fff; margin-left: 20rpx; margin-right: 20rpx; margin-top: 8rpx; border-radius: 8rpx">
@@ -320,6 +320,12 @@ const getBalance = (label, packageInfoParams, callback) => {
     })
 }
 const onScan = (result) => {
+  if (!result.package) {
+    showErrorMessage(`扫描数据错误[${result.label.code}]`, (res) => {
+      getfocus()
+    })
+    return
+  }
   if (toLocation.value && result.package.packUnit) {
     const item = toLocation.value.Items.find((r) => r.itemCode == result.package.itemCode)
     if (result.package.packUnit !== item.packUnit) {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index d1ab1e28..4cf5c717 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -323,6 +323,14 @@ const openScanPopup = () => {
   scanPopup.value.openScanPopup()
 }
 const getScanResult = (result) => {
+  if (!result.label.batch) {
+    showMessage('批次为空')
+    return
+  }
+  if (!result.label.itemCode) {
+    showMessage('物料号为空')
+    return
+  }
   try {
     const filters = [
       {
@@ -344,7 +352,7 @@ const getScanResult = (result) => {
     getIssueJobList({
       filters,
       pageNo: 1,
-      pageSize: 100,
+      pageSize: 1000,
       sort: 'createTime',
       by: 'asc'
     })
@@ -362,9 +370,7 @@ const getScanResult = (result) => {
               list.push(item)
             }
           })
-          if (list.length > 1) {
-            jobListRef.value.openList(list)
-          } else {
+          if (list.length > 0) {
             selectItem(list[0])
           }
         } else {
diff --git a/src/pages/package/coms/comPackageRecord.vue b/src/pages/package/coms/comPackageRecord.vue
index fe24a43d..3077e3c1 100644
--- a/src/pages/package/coms/comPackageRecord.vue
+++ b/src/pages/package/coms/comPackageRecord.vue
@@ -1,171 +1,157 @@
 <template>
-	<view class="" style="background-color: #fff;">
-		<record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index,dataContent)"
-			:isShowItemQty='false'>
-		</record-com-detail-card>
+  <view class="" style="background-color: #fff">
+    <record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index, dataContent)" :isShowItemQty="false"> </record-com-detail-card>
 
-		<view class="" v-for="(detail,index) in dataContent.subList">
-			<view v-if="detail.Records!=undefined" style='margin-left: 20px;' v-for="(record,index) in detail.Records">
-				<uni-swipe-action ref="">
-					<uni-swipe-action-item @click="swipeClick($event,detail,record,index)"
-						:right-options="record.scaned?scanOptions:detailOptions">
-						<view class="uni-flex uni-row scan_view margin-top: 5px;">
-							<view
-								style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;">
-								{{index+1}}.
-							</view>
-							<view style="width: 300px;">
-								<!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false"
+    <view class="" v-for="(detail, index) in dataContent.subList">
+      <view v-if="detail.Records != undefined" style="margin-left: 20px" v-for="(record, index) in detail.Records">
+        <uni-swipe-action ref="">
+          <uni-swipe-action-item @click="swipeClick($event, detail, record, index)" :right-options="record.scaned ? scanOptions : detailOptions">
+            <view class="uni-flex uni-row scan_view margin-top: 5px;">
+              <view style="width: 20px; display: flex; justify-content: center; align-items: center; color: #32c1e8"> {{ index + 1 }}. </view>
+              <view style="width: 300px">
+                <!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false"
 									:isShowLocation="false"></recommend> -->
-								<balance :dataContent="record" :packageContent="record.package" :isShowStatus="false"
-									:isShowFromLocation="false"></balance>
-							</view>
-						</view>
-					</uni-swipe-action-item>
-				</uni-swipe-action>
-			</view>
-		</view>
-		<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty='editItem.qty' @confirm="confirm">
-		</recommend-qty-edit>
-		<package-detail-popup ref='packageDetailPopup'></package-detail-popup>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
+                <balance :dataContent="record" :packageContent="record.package" :isShowStatus="false" :isShowFromLocation="false" :isShowToLocation="false"></balance>
+              </view>
+            </view>
+          </uni-swipe-action-item>
+        </uni-swipe-action>
+      </view>
+    </view>
+    <recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty="editItem.qty" @confirm="confirm"> </recommend-qty-edit>
+    <package-detail-popup ref="packageDetailPopup"></package-detail-popup>
+    <comMessage ref="comMessage"></comMessage>
+  </view>
 </template>
 
 <script>
-	import itemQty from '@/mycomponents/item/itemQty.vue'
-	import recommend from '@/mycomponents/recommend/recommend.vue'
-	import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
-	import record from '@/mycomponents/record/record.vue'
-	import balance from '@/mycomponents/balance/balance.vue'
-	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
-	import packageBalance from '@/mycomponents/package/packageBalance.vue'
-	import packageHandle from '@/mycomponents/package/packageHandle.vue'
-	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
+import itemQty from '@/mycomponents/item/itemQty.vue'
+import recommend from '@/mycomponents/recommend/recommend.vue'
+import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
+import record from '@/mycomponents/record/record.vue'
+import balance from '@/mycomponents/balance/balance.vue'
+import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+import packageBalance from '@/mycomponents/package/packageBalance.vue'
+import packageHandle from '@/mycomponents/package/packageHandle.vue'
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
 
-	import {
-		getDetailOption,
-		getDetailEditRemoveOption,
-		getClearOption
-	} from '@/common/array.js';
-	export default {
-		components: {
-			itemQty,
-			recommend,
-			purchaseLabel,
-			balance,
-			recommendQtyEdit,
-			record,
-			packageBalance,
-			packageHandle,
-			recordComDetailCard,
-			packageDetailPopup
-		},
-		props: {
-			dataContent: {
-				type: Object,
-				default: {}
-			},
-			settingParam: {
-				type: Object,
-				default: {}
-			},
-			fromInventoryStatus: {
-				type: String,
-				default: ""
-			},
-			toInventoryStatus: {
-				type: String,
-				default: ""
-			},
-			isShowStatus: {
-				type: Boolean,
-				default: false
-			}
-		},
-		watch: {
-			// dataContent: {
-			// 	handler(newName, oldName) {
-			// 		if (this.dataContent.originalList.length > 0) {
-			// 			if (this.$refs.collapse1 != undefined) {
-			// 				this.$nextTick(res => {
-			// 					this.$refs.collapse1.resize()
-			// 				})
-			// 			}
-			// 		}
-			// 	},
-			// 	immediate: true,
-			// 	deep: true
-			// }
-		},
+import { getDetailOption, getDetailEditRemoveOption, getClearOption } from '@/common/array.js'
 
-		data() {
-			return {
-				option: [],
-				title: "推荐详情",
-				showItem: {},
-				editItem: {},
-				detailOptions: [],
-				scanOptions: [],
-				removeOptions: [],
-				dataList: []
-			}
-		},
+export default {
+  components: {
+    itemQty,
+    recommend,
+    purchaseLabel,
+    balance,
+    recommendQtyEdit,
+    record,
+    packageBalance,
+    packageHandle,
+    recordComDetailCard,
+    packageDetailPopup
+  },
+  props: {
+    dataContent: {
+      type: Object,
+      default: {}
+    },
+    settingParam: {
+      type: Object,
+      default: {}
+    },
+    fromInventoryStatus: {
+      type: String,
+      default: ''
+    },
+    toInventoryStatus: {
+      type: String,
+      default: ''
+    },
+    isShowStatus: {
+      type: Boolean,
+      default: false
+    }
+  },
+  watch: {
+    // dataContent: {
+    // 	handler(newName, oldName) {
+    // 		if (this.dataContent.originalList.length > 0) {
+    // 			if (this.$refs.collapse1 != undefined) {
+    // 				this.$nextTick(res => {
+    // 					this.$refs.collapse1.resize()
+    // 				})
+    // 			}
+    // 		}
+    // 	},
+    // 	immediate: true,
+    // 	deep: true
+    // }
+  },
 
-		mounted() {
-			this.detailOptions = getDetailOption();
-			this.scanOptions = getDetailEditRemoveOption();
-			this.removeOptions = getClearOption();
-		},
+  data() {
+    return {
+      option: [],
+      title: '推荐详情',
+      showItem: {},
+      editItem: {},
+      detailOptions: [],
+      scanOptions: [],
+      removeOptions: [],
+      dataList: []
+    }
+  },
 
-		methods: {
-			removeItem(e, dataContent) {
-				if (e.content.text == "清空") {
-					this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?",
-						res => {
-							if (res) {
-								this.$emit('removeItem')
-								// this.$emit('removeItem', this.dataContent)
-							}
-						});
-				}
-			},
-			swipeClick(e, detail, record, index) {
-				if (e.content.text == "详情") {
-					this.detail(detail.package)
-				} else if (e.content.text == "编辑") {
-					this.edit(record)
-				} else if (e.content.text == "移除") {
-					this.remove(detail, index)
-				}
-			},
+  mounted() {
+    this.detailOptions = getDetailOption()
+    this.scanOptions = getDetailEditRemoveOption()
+    this.removeOptions = getClearOption()
+  },
 
-			edit(item) {
-				this.editItem = item;
-				this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty);
-			},
+  methods: {
+    removeItem(e, dataContent) {
+      if (e.content.text == '清空') {
+        this.$refs.comMessage.showQuestionMessage('确定清空物料及箱码信息?', (res) => {
+          if (res) {
+            this.$emit('removeItem')
+            // this.$emit('removeItem', this.dataContent)
+          }
+        })
+      }
+    },
+    swipeClick(e, detail, record, index) {
+      if (e.content.text == '详情') {
+        this.detail(detail.package)
+      } else if (e.content.text == '编辑') {
+        this.edit(record)
+      } else if (e.content.text == '移除') {
+        this.remove(detail, index)
+      }
+    },
 
-			detail(item) {
-				this.showItem = item;
-				this.$refs.packageDetailPopup.openPopup(item)
-			},
-			remove(detail, index) {
-				this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?",
-					res => {
-						if (res) {
-							detail.Records.splice(index, 1)
-							this.$emit('removePack')
-						}
-					});
-			},
-			confirm(qty) {
-				this.editItem.qty = qty;
-				this.$emit('updateData')
-			}
-		}
-	}
+    edit(item) {
+      this.editItem = item
+      this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty)
+    },
+
+    detail(item) {
+      this.showItem = item
+      this.$refs.packageDetailPopup.openPopup(item)
+    },
+    remove(detail, index) {
+      this.$refs.comMessage.showQuestionMessage('确定移除扫描信息?', (res) => {
+        if (res) {
+          detail.Records.splice(index, 1)
+          this.$emit('removePack')
+        }
+      })
+    },
+    confirm(qty) {
+      this.editItem.qty = qty
+      this.$emit('updateData')
+    }
+  }
+}
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/pages/package/record/splitPackageRecord.vue b/src/pages/package/record/splitPackageRecord.vue
index 5cf86210..e0bbcad4 100644
--- a/src/pages/package/record/splitPackageRecord.vue
+++ b/src/pages/package/record/splitPackageRecord.vue
@@ -1,382 +1,351 @@
 <template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' 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="(item, index) in detailSource" :key="item.id">
-						<view class="">
-							<com-package-record :dataContent="item" @removeItem="removeItem(index,item)"
-								@updateData="updateData" @removePack='updateData'>
-							</com-package-record>
-						</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="commit">提交</button>
-					</view>
-				</view>
-			</view>
-
-			<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
-		</view>
-
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
-		</win-scan-pack-and-location>
-		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
-		<win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
+  <view class="page-wraper">
+    <view class="">
+      <com-blank-view @goScan="showFromLocationPopup" 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="(item, index) in detailSource" :key="item.id">
+            <view class="">
+              <com-package-record :dataContent="item" @removeItem="removeItem(index, item)" @updateData="updateData" @removePack="updateData"> </com-package-record>
+            </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="commit">提交</button>
+          </view>
+        </view>
+      </view>
+
+      <win-scan-button @goScan="showScanPopupPack"></win-scan-button>
+    </view>
+
+    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :allowModifyLocation="false"> </win-scan-pack-and-location>
+    <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult="getScanPackResult"></win-scan-pack>
+    <comMessage ref="comMessage"></comMessage>
+  </view>
 </template>
 
 <script>
-	import {
-		goHome,
-	} from '@/common/basic.js';
-	import {
-		splitPackageRecordSubmit
-	} from '@/api/request2.js';
-
-	import {
-		calc
-	} from '@/common/calc.js';
-
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty
-	} from '@/common/record.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
-	import comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPack,
-			requiredLocation,
-			comBlankView,
-			winScanLocation,
-			winScanPackAndLocation,
-			recommendBalance,
-			recordComDetailCard,
-			comPackageRecord
-		},
-		data() {
-			return {
-				id: '',
-				detailSource: [], //绑定在页面上的数据源
-				fromLocationCode: "",
-				toLocationCode: "",
-				fromLocationAreaTypeList: [],
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				dataContent: {},
-				currentItemCode: "",
-				toPackingNumber: ""
-			};
-		},
-		onLoad(option) {
-			var typeCode = "SplitPackage"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {},
-
-		onPullDownRefresh() {},
-
-		mounted() {
-			// this.showFromLocationPopup();
-		},
-		methods: {
-			showScanPopupPack() {
-				this.$refs.scanPopupPack.openScanPopup();
-			},
-
-			getScanResult(result) {
-				let balance = result.balance;
-				let label = result.label;
-				let pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack); //
-					newDetail.scaned = false;
-					newDetail.Records = [];
-					newDetail.handleQty = 0
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
-				}
-				this.$refs.scanPopup.closeScanPopup();
-				this.showScanPopupPack();
-			},
-
-			getScanPackResult(result) {
-				var packingNumber = result.label.packingNumber;
-				var batch = result.label.batch;
-				var qty = result.label.qty;
-				var itemCode = result.label.itemCode;
-				var uom = result.package.uom;
-				var item = this.detailSource.find(r => r.itemCode == itemCode);
-				if (item == undefined) {
-					this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-				} else {
-					var temp = {
-						scaned: true,
-						packingNumber: packingNumber,
-						batch: batch,
-						qty: Number(qty),
-						LabelQty: Number(qty),
-						stdPackUnit: result.package.stdPackUnit,
-						stdPackQty: result.package.stdPackQty,
-						uom: uom
-					}
-
-					var sumQty = 0;
-					item.subList[0].Records.forEach(function(item1, index) {
-						sumQty = calc.add(sumQty,item1.qty)
-					});
-					if (calc.add(qty,sumQty)> item.subList[0].qty) {
-						this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" +
-							sumQty +
-							"】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!");
-						return;
-					}
-					item.subList[0].Records.push(temp);
-					this.$forceUpdate();
-				}
-				this.calcHandleQty();
-			},
-
-			calcHandleQty() {
-				for (let detail of this.detailSource[0].subList) {
-					let hQty = 0;
-					if (detail.Records.length > 0) {
-
-						detail.Records.forEach(r => {
-							hQty = calc.add(hQty,r.qty)
-						})
-					}
-					detail.handleQty = hQty;
-				}
-				this.$forceUpdate();
-			},
-
-
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-
-
-
-			updateData() {
-				this.calcHandleQty();
-			},
-			removeItem(index, item) {
-				this.detailSource.splice(index, 1)
-			},
-
-
-			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();
-				}
-			},
-
-			commit() {
-				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					uni.showLoading({
-						title: "提交中....",
-						mask: true
-					});
-
-					var params = this.setParams();
-					console.log("提交" + JSON.stringify(params))
-					splitPackageRecordSubmit(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 {
-					this.showErrorMessage("没有要提交的数据")
-				}
-
-			},
-
-			setParams() {
-
-				var subList = []
-				var creator = this.$store.state.user.id
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						detail.Records.forEach(record => {
-							if (record.scaned) {
-								var subItem = {};
-								Object.assign(subItem, detail)
-								subItem.itemCode = subItem.itemCode;
-								subItem.itemName = detail.package.itemName;
-								subItem.itemDesc1 = detail.package.itemDesc1;
-								subItem.itemDesc2 = detail.package.itemDesc2;
-
-								subItem.fromInventoryStatus = subItem.inventoryStatus;
-								subItem.toInventoryStatus = subItem.inventoryStatus;
-
-								subItem.fromQty = subItem.qty
-								subItem.toQty = record.qty
-
-								subItem.fromPackingNumber = subItem.packingNumber;
-								subItem.toPackingNumber = record.packingNumber;
-
-								subItem.fromBatch = subItem.batch;
-								subItem.toBatch = record.batch;
-								subItem.fromLocationCode = subItem.fromLocationCode;
-								subItem.package = ""
-								subItem.Records = ""
-								subList.push(subItem)
-							}
-
-						})
-					})
-				})
-
-				this.dataContent.subList = subList;
-				this.dataContent.creator = creator;
-				return this.dataContent;
-			},
-
-			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.getFromLocationCode(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.toLocationCode = code;
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.detailSource = []
-					this.fromLocationCode = '';
-					this.currentItemCode = ""
-					this.dataContent = {}
-
-				})
-			},
-
-			updateData() {
-				this.calcHandleQty();
-			}
-		}
-	}
+import { goHome } from '@/common/basic.js'
+import { splitPackageRecordSubmit } from '@/api/request2.js'
+
+import { calc } from '@/common/calc.js'
+
+import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js'
+
+import { getBusinessType, createItemInfo, createDetailInfo, calcHandleQty } from '@/common/record.js'
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
+import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
+import comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
+
+export default {
+  components: {
+    winScanButton,
+    winScanPack,
+    requiredLocation,
+    comBlankView,
+    winScanLocation,
+    winScanPackAndLocation,
+    recommendBalance,
+    recordComDetailCard,
+    comPackageRecord
+  },
+  data() {
+    return {
+      id: '',
+      detailSource: [], // 绑定在页面上的数据源
+      fromLocationCode: '',
+      toLocationCode: '',
+      fromLocationAreaTypeList: [],
+      inInventoryStatus: '', // 目标入库库存状态
+      outInventoryStatus: '', // 来源出库库存状态
+      businessType: {},
+      dataContent: {},
+      currentItemCode: '',
+      toPackingNumber: ''
+    }
+  },
+  onLoad(option) {
+    const typeCode = 'SplitPackage'
+    getBusinessType(typeCode, (res) => {
+      if (res.success) {
+        this.businessType = res.businessType
+        this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+        this.showFromLocationPopup()
+      } else {
+        this.showErrorMessage(res.message)
+      }
+    })
+  },
+  // 返回首页
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      goHome()
+    }
+  },
+  // 拦截返回按钮事件
+  onBackPress(e) {},
+
+  onPullDownRefresh() {},
+
+  mounted() {
+    // this.showFromLocationPopup();
+  },
+  methods: {
+    showScanPopupPack() {
+      this.$refs.scanPopupPack.openScanPopup()
+    },
+
+    getScanResult(result) {
+      const { balance } = result
+      const { label } = result
+      const pack = result.package
+      const item = this.detailSource.find((res) => {
+        if (res.itemCode == balance.itemCode) {
+          return res
+        }
+      })
+      if (item == undefined) {
+        const itemp = createItemInfo(balance, pack)
+        const newDetail = createDetailInfo(balance, pack) //
+        newDetail.scaned = false
+        newDetail.Records = []
+        newDetail.handleQty = 0
+        itemp.subList.push(newDetail)
+        this.detailSource.push(itemp)
+      } else {
+        this.showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
+      }
+      this.$refs.scanPopup.closeScanPopup()
+      this.showScanPopupPack()
+    },
+
+    getScanPackResult(result) {
+      const { packingNumber } = result.label
+      const { batch } = result.label
+      const { qty } = result.label
+      const { itemCode } = result.label
+      const { uom } = result.package
+      const item = this.detailSource.find((r) => r.itemCode == itemCode)
+      if (item == undefined) {
+        this.showErrorMessage(`物料号【${itemCode}】不在列表中`)
+      } else {
+        const temp = {
+          scaned: true,
+          packingNumber,
+          batch,
+          qty: Number(qty),
+          LabelQty: Number(qty),
+          stdPackUnit: result.package.stdPackUnit,
+          stdPackQty: result.package.stdPackQty,
+          uom
+        }
+
+        let sumQty = 0
+        item.subList[0].Records.forEach(function (item1, index) {
+          sumQty = calc.add(sumQty, item1.qty)
+        })
+        // if (calc.add(qty,sumQty)> item.subList[0].qty) {
+        // 	this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" +
+        // 		sumQty +
+        // 		"】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!");
+        // 	return;
+        // }
+        item.subList[0].Records.push(temp)
+        this.$forceUpdate()
+      }
+      this.calcHandleQty()
+    },
+
+    calcHandleQty() {
+      for (const detail of this.detailSource[0].subList) {
+        let hQty = 0
+        if (detail.Records.length > 0) {
+          detail.Records.forEach((r) => {
+            hQty = calc.add(hQty, r.qty)
+          })
+        }
+        detail.handleQty = hQty
+      }
+      this.$forceUpdate()
+    },
+
+    showErrorMessage(message) {
+      this.$refs.comMessage.showErrorMessage(message, (res) => {
+        if (res) {
+        }
+      })
+    },
+
+    updateData() {
+      this.calcHandleQty()
+    },
+    removeItem(index, item) {
+      this.detailSource.splice(index, 1)
+    },
+
+    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()
+      }
+    },
+
+    commit() {
+      if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+        uni.showLoading({
+          title: '提交中....',
+          mask: true
+        })
+
+        const params = this.setParams()
+        console.log(`提交${JSON.stringify(params)}`)
+        splitPackageRecordSubmit(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 {
+        this.showErrorMessage('没有要提交的数据')
+      }
+    },
+
+    setParams() {
+      const subList = []
+      const creator = this.$store.state.user.id
+      this.detailSource.forEach((item) => {
+        item.subList.forEach((detail) => {
+          detail.Records.forEach((record) => {
+            if (record.scaned) {
+              const subItem = {}
+              Object.assign(subItem, detail)
+              subItem.itemCode = subItem.itemCode
+              subItem.itemName = detail.package.itemName
+              subItem.itemDesc1 = detail.package.itemDesc1
+              subItem.itemDesc2 = detail.package.itemDesc2
+
+              subItem.fromInventoryStatus = subItem.inventoryStatus
+              subItem.toInventoryStatus = subItem.inventoryStatus
+
+              subItem.fromQty = subItem.qty
+              subItem.toQty = record.qty
+
+              subItem.fromPackingNumber = subItem.packingNumber
+              subItem.toPackingNumber = record.packingNumber
+
+              subItem.fromBatch = subItem.batch
+              subItem.toBatch = record.batch
+              subItem.fromLocationCode = subItem.fromLocationCode
+              subItem.package = ''
+              subItem.Records = ''
+              subList.push(subItem)
+            }
+          })
+        })
+      })
+
+      this.dataContent.subList = subList
+      this.dataContent.creator = creator
+      return this.dataContent
+    },
+
+    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.getFromLocationCode(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.toLocationCode = code
+    },
+
+    showCommitSuccessMessage(hint) {
+      this.$refs.comMessage.showSuccessMessage(hint, (res) => {
+        this.detailSource = []
+        this.fromLocationCode = ''
+        this.currentItemCode = ''
+        this.dataContent = {}
+      })
+    },
+
+    updateData() {
+      this.calcHandleQty()
+    }
+  }
+}
 </script>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index f10dfa26..d4848fd2 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -10,6 +10,8 @@
       <repleinsh-job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></repleinsh-job-list-popup>
       <u-loadmore :status="loadingType" v-if="jobList.length > 0" />
     </view>
+    <win-scan-button @goScan="openScanPopup" v-if="jobList.length > 0"></win-scan-button>
+    <winScanPackJob ref="scanPopup" @getResult="getScanResult"></winScanPackJob>
     <com-message ref="comMessageRef" />
   </view>
 </template>
@@ -30,6 +32,8 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue'
 import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue'
 import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue'
 import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue'
 
 import { useCountStore } from '@/store'
 // 获取自定义的store
@@ -46,6 +50,7 @@ const waitTask = ref(false)
 const todayTime = ref('')
 const status = ref('1,2') // 待处理 、进行中
 const detailOptions = ref([])
+const scanMessage = ref('')
 const detailGiveupOptions = ref([])
 const filter = ref()
 const comMessageRef = ref()
@@ -162,8 +167,8 @@ const fromLocationCode = (fromLocationCode) => {
   console.log('fromLocationCode', fromLocationCode)
   getList('refresh', fromLocationCode, '')
 }
-const openJobDetail = (item) => {
-  proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}`)
+const openJobDetail = (item, scanMessageParams = '') => {
+  proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessageParams}`)
 }
 const selectedItem = (item) => {
   openJobDetail(item)
@@ -262,6 +267,75 @@ const showMessage = (message) => {
     }
   })
 }
+const openScanPopup = () => {
+  scanPopup.value.openScanPopup()
+}
+const selectItem = (item) => {
+  scanPopup.value.closeScanPopup()
+  openJobDetail(item, scanMessage.value)
+}
+const getScanResult = (result) => {
+  if (!result.label.batch) {
+    showMessage('批次为空')
+    return
+  }
+  if (!result.label.itemCode) {
+    showMessage('物料号为空')
+    return
+  }
+  try {
+    const filters = [
+      {
+        column: 'status',
+        action: 'in',
+        value: '1,2'
+      },
+      {
+        column: 'batch',
+        action: '==',
+        value: result.label.batch
+      },
+      {
+        column: 'itemCode',
+        action: '==',
+        value: result.label.itemCode
+      }
+    ]
+    getRepleinshJobList({
+      filters,
+      pageNo: 1,
+      pageSize: 1000,
+      sort: 'createTime',
+      by: 'asc'
+    })
+      .then((res) => {
+        scanMessage.value = result.scanMessage
+        const resultList = res.data.list
+        if (resultList.length > 0) {
+          resultList.forEach((item) => {
+            item.title = item.number
+            item.selected = false
+          })
+          const list = []
+          resultList.forEach((item) => {
+            if (!list.find((subItem) => subItem.title == item.title)) {
+              list.push(item)
+            }
+          })
+          if (list.length > 0) {
+            selectItem(list[0])
+          }
+        } else {
+          showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`)
+        }
+      })
+      .catch((error) => {
+        showMessage(error)
+      })
+  } catch (e) {
+    showMessage(e.message)
+  }
+}
 </script>
 
 <style scoped lang="scss"></style>