diff --git a/src/pages/deliver/coms/comDeliverDetailCard.vue b/src/pages/deliver/coms/comDeliverDetailCard.vue
index a4f310e1..127b5cc4 100644
--- a/src/pages/deliver/coms/comDeliverDetailCard.vue
+++ b/src/pages/deliver/coms/comDeliverDetailCard.vue
@@ -21,8 +21,8 @@
               <view v-for="(batch, index1) in loacation.Batchs" :key="index1">
                 <recommend-balance style="margin-left: 0rpx" :detail="batch" :isShowLocation="false" :isShowPack="batch.packingNumber != null && batch.packingNumber != ''"> </recommend-balance>
                 <view class="uni-flex uni-row" v-if="batch.Records.length > 0">
-                  <view class="center" style="width: 20px; background-color: #0cc2b6; color: #fff; padding: 0px 2px; font-size: 24rpx"> 实际 </view>
-                  <view class="uni-flex uni-column" style="flex: 1; width: 0px">
+                  <view class="center" style="width: 20px; background-color: #0cc2b6; color: #fff; padding: 0px 2px; font-size: 24rpx"> 扫描 </view>
+                  <view class="uni-flex uni-column scan_view" style="flex: 1; width: 0px">
                     <u-swipe-action :show="record.show" :index="key" v-for="(record, key) in batch.Records" :key="key" :options="scanOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, batch, record)" style="width: 100%">
                       <handle-balance :detail="record" :isShowLocation="false" :isShowBatch="batch.packingNumber != null"> </handle-balance>
                     </u-swipe-action>
diff --git a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
new file mode 100644
index 00000000..f8138715
--- /dev/null
+++ b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
@@ -0,0 +1,140 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.subList" style="margin-bottom: 20rpx;">
+			<uni-swipe-action ref="swipeAction" :class="item.scaned? 'scan_view':''">
+				<uni-swipe-action-item
+					:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
+					@click="swipeClick($event,item,index)" style='padding:20rpx 0px  5px 0px;align-items: center;'>
+					<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false"></item-qty>
+					<location :locationCode="item.fromLocationCode"></location>
+					<recommendBalanceBatch style='margin-left: 20px;' :detail="item" :isShowLocation="false"
+						:isShowPack="item.packingNumber"></recommendBalanceBatch>
+
+				</uni-swipe-action-item>
+			</uni-swipe-action>
+		</view>
+	</view>
+	<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></qtyEdit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import qtyEdit from '@/mycomponents/qty/qtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
+import {
+		getDetailOption,
+		getPurchaseReceiptOption,
+		getRemoveOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData'],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalanceBatch,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			qtyEdit,
+			location,
+			detailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isEdit: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			
+			this.removeOptions = getRemoveOption();
+			this.editAndRemoveOptions = getEditRemoveOption()
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				let that = this;
+				that.editItem = item;
+				that.$refs.balanceQtyEdit.openEditPopup(item);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+						item.handleQty = 0;
+						item.scaned = false ;
+						}
+					});
+			},
+			confirm(val) {
+					this.editItem.handleQty =  Number(val);
+					this.$emit('updateData', this.editItem)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index ab915a98..4dfec921 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -10,16 +10,16 @@
               <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">
+          <!--<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">
             <view class="uni-center" style="width: 25%"> 来源库位 </view>
             <view class="" style="width: 75%; padding: 8rpx">
               <uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位" @confirm="fromLocationUpdate"></uni-combox>
             </view>
-          </view>
+          </view>-->
 
           <view class="">
             <view class="">
-              <win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true" :headerType="headerType" :isShowHistory="false"> </win-com-scan>
+              <win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true" headerType="HPQ,HMQ" :isShowHistory="false"> </win-com-scan>
 
               <view style="width: 100%">
                 <view style="width: 100%" v-if="issueRecord.length > 0">
@@ -66,7 +66,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, getCurrentInstance, nextTick, onMounted } from 'vue'
+import {ref, getCurrentInstance, nextTick, onMounted, reactive} from 'vue'
 import winComScan from '@/mycomponents/scan/winComScan.vue'
 import balance from '@/mycomponents/balance/balance.vue'
 import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
@@ -77,8 +77,9 @@ import { getDetailOption, getDetailEditRemoveOption } from '@/common/array.js'
 import { getDirectoryItemArray } from '@/common/directory.js'
 
 import { calc } from '@/common/calc.js'
-import { getWorkShopLineStation } from '@/api/request2.js'
-
+import { getWorkShopLineStation, getBalanceByFilter, getBalanceByParams, } from '@/api/request2.js'
+import {getLabelInfo} from '@/common/label.js';
+import {uniqueArray} from '@/common/basic.js';
 import { getBalanceByManagementPrecision } from '@/common/balance.js'
 
 const { proxy } = getCurrentInstance()
@@ -87,10 +88,6 @@ const props = defineProps({
     type: String,
     default: ''
   },
-  headerType: {
-    type: String,
-    default: 'HPQ,HMQ'
-  }
 })
 const dataContent = ref({})
 const jobContent = ref({})
@@ -110,7 +107,6 @@ const positionInfo = ref('请选择位置')
 const positionList = ref([])
 const defaultValueList = ref([])
 const fromInventoryStatuses = ref('')
-const fromInventoryStatuses = ref([])
 const packageInfo = ref({})
 const label = ref({})
 const toLocationCombox = ref()
@@ -120,18 +116,37 @@ const comscan = ref()
 const balanceSelectRef = ref()
 const balanceQtyEditRef = ref()
 const showItem = ref()
+const inputStyleObject = reactive({
+  fontSize:'100rpx'
+})
+const bussinessCode = ref('Issue')
+const toLocationAreaTypeList = ref([])
 onMounted(() => {
   detailOptions.value = getDetailOption()
   scanOptions.value = getDetailEditRemoveOption()
 })
+const openScanPopupForJobSimulate = (content, jobcontent, scanMessage)=> {
+  issueRecord.value = [];
+  dataContent.value = content;
+  jobContent.value = jobcontent;
+  initData();
+  getLabelInfo(scanMessage, "HPQ,HMQ", callback => {
+    if (callback.success) {
+      onScan(callback);
+    } else {
+      showErrorMessage(callback.message, res => {})
+    }
+  })
+}
 const openScanPopup = (content, jobcontent) => {
   issueRecord.value = []
   dataContent.value = content
   jobContent.value = jobcontent
   initData()
-  positionInfo.value = `${jobContent.value.workShopCode}-${jobContent.value.subList[0].productionLineCode}-${jobContent.value.subList[0].workStationCode}`
+  // positionInfo.value = `${jobContent.value.workShopCode}-${jobContent.value.subList[0].productionLineCode}-${jobContent.value.subList[0].workStationCode}`
+  show.value = true
   setTimeout((res) => {
-    show.value = true
+    getfocus()
   }, 500)
 }
 const closeScanPopup = () => {
@@ -144,48 +159,47 @@ const closeScanPopup = () => {
 const initData = () => {
   fromLocationList.value = []
   if (dataContent.value != null) {
-    fromInventoryStatuses.value = getDirectoryItemArray(jobContent.value.outInventoryStatuses)
+    fromInventoryStatuses.value = jobContent.value.outInventoryStatuses
     toLocation.value = dataContent.value[0]
     toLocationCode.value = dataContent.value[0].toLocationCode
-    fromLocationList.value = getFromLocationList()
+    toLocationAreaTypeList.value = getDirectoryItemArray(jobContent.value.toAreaTypes)
+    // fromLocationList.value = getFromLocationList()
   }
 }
-const showBalanceSelect = (items, packageInfoParams) => {
-  packageInfo.value = packageInfoParams
+const showBalanceSelect = (items) => {
   balanceSelectRef.value.openPopup(items)
 }
-const getFromLocationList = () => {
-  const list = []
-  const location = dataContent.value.find((r) => r.toLocationCode == toLocationCode.value)
-  if (location != undefined) {
-    location.Items.forEach((item) => {
-      item.Locations.forEach((f) => {
-        list.push(f.fromLocationCode)
-      })
-    })
-    fromLocationCode.value = list[0]
-    return list
-  }
-  comMessageRef.value.showErrorMessages(`需求库位【${toLocationCode.value}】不存在`, (res) => {
-    toLocationCode.value = ''
-  })
-}
+// const getFromLocationList = () => {
+//   const list = []
+//   const location = dataContent.value.find((r) => r.toLocationCode == toLocationCode.value)
+//   if (location != undefined) {
+//     location.Items.forEach((item) => {
+//       item.Locations.forEach((f) => {
+//         list.push(f.fromLocationCode)
+//       })
+//     })
+//     fromLocationCode.value = list[0]
+//     return list
+//   }
+//   comMessageRef.value.showErrorMessages(`需求库位【${toLocationCode.value}】不存在`, (res) => {
+//     toLocationCode.value = ''
+//   })
+// }
 const fromLocationUpdate = (fromlocation) => {
   const location = fromLocationList.value.find((r) => r == fromlocation)
-  // 成品发货任务--同一物料，可以扫描提交不在任务中的库位
-  // if (location == undefined) {
-    // showErrorMessage(`发货库位【${fromlocation}】不存在`)
-  // }
-  fromLocationCode.value = fromlocation
+  if (location == undefined) {
+    fromLocationCode.value = fromlocation
+    showErrorMessage(`发货库位【${fromlocation}】不存在`)
+  }
 }
-const onScan = (result) => {
+const queryBalance = (result) => {
   try {
-    if (fromLocationCode.value == '') {
-      showErrorMessage('请选择来源库位', (res) => {
-        toLocationCombox.value.onFocus()
-      })
-      return
-    }
+    // if (fromLocationCode.value == '') {
+    //   showErrorMessage('请选择来源库位', (res) => {
+    //     toLocationCombox.value.onFocus()
+    //   })
+    //   return
+    // }
 
     const packageInfo = result.package
     const { itemCode } = result.label
@@ -199,31 +213,184 @@ const onScan = (result) => {
       return
     }
     // 查找库存信息
+    const params = {
+      itemCode: result.package.itemCode,
+      batch: result.label.batch,
+      packingNumber: result.label.packingNumber,
+      parentPackingNumber: result.package.parentNumber,
+      inventoryStatus: jobContent.value.outInventoryStatuses.split(','),
+      areaType: jobContent.value.fromAreaTypes.split(','),
+      bussinessCode: jobContent.value.businessType
+    }
     proxy.$modal.loading('加载中')
-    getBalanceByManagementPrecision(result.label, fromLocationCode.value, fromInventoryStatuses.value, (balanceRes) => {
-      if (balanceRes.success) {
-        if (balanceRes.data.list.length == 0) {
-          showErrorMessage(`在来源库位[${fromLocationCode.value}],未查找到该包装的库存记录`, (res) => {
-            packGetFocus()
-          })
-        } else if (balanceRes.data.list.length == 1) {
-          const balance = balanceRes.data.list[0]
-          afterGetBalance(result.label, balance, packageInfo)
+    getBalanceByParams(params, (balanceRes) => {
+      if (balanceRes.data.list.length == 0) {
+        let status = getInventoryStatusDesc(params.inventoryStatus)
+        let areaType = getListLocationAreaTypeDesc(params.areaType)
+        let hint = "按物料号 [" + params.itemCode + "] \n" +
+            "包装号 [" + params.packingNumber + "] \n" +
+            "批次 [" + params.batch + "] \n" +
+            "状态 [" + status + "] \n" +
+            "库区 [" + areaType + "] \n" +
+            "未查找到库存余额"
+        showErrorMessage(hint, (res) => {
+          getfocus()
+        })
+      }
+      else if (balanceRes.data.length == 1) {
+        result.balance = balanceRes.data[0]
+        if (result.label.packingNumber != result.balance.packingNumber) {
+          result.balance.qty = Number(result.label.qty)
         } else {
-          showBalanceSelect(balanceRes.data.list, packageInfo)
+          result.balance.qty = Number(result.balance.qty)
         }
-      } else {
-        showErrorMessage(balanceRes.message.message)
+        afterGetBalance(result.label, result.balance, result.package);
       }
+      else {
+        balanceSelectRef.value.openPopup(balanceRes.data)
+      }
+      uni.hideLoading()
+    }).catch(error => {
       uni.hideLoading()
+      showErrorMessage(e,res=>{
+        getfocus()
+      })
     })
   } catch (e) {
-    showErrorMessage(e.stack)
+    showErrorMessage(e,res=>{
+      getfocus()
+    })
     uni.hideLoading()
   }
 }
+const getBalance = (label, packageInfo, callback)=> {
+  let filters = []
+  if (packageInfo.parentNumber) {
+    let 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 (fromInventoryStatuses.value != null && fromInventoryStatuses.value != "") {
+    filters.push({
+      column: "inventoryStatus",
+      action: "in",
+      value: fromInventoryStatuses.value
+    })
+  }
+
+  let params = {
+    filters: filters,
+    pageNo: 1,
+    pageSize: 100,
+  }
+  getBalanceByFilter(params).then(res => {
+    callback(res.data)
+  }).catch(err => {
+    showErrorMessage(err.message);
+  })
+}
+
+
+const onScan = (result)=> {
+  if (!result.package) {
+    this.showErrorMessage('扫描数据错误[' + result.label.code + "]",
+        res => {
+          getfocus();
+        }
+    )
+    return;
+  }
+  if (toLocation.value && result.package.packUnit) {
+    let item = toLocation.value.Items.find(r => r.itemCode == result.package.itemCode);
+    if (!item) {
+      showErrorMessage('扫描物料代码不属于该任务');
+      return
+    }
+    getToLocationBalance(result)
+  }
+}
+
+//查询到目标库位的库存余额
+const getToLocationBalance = (result)=> {
+  uni.showLoading({
+    title: '查询中',
+    mask: true
+  })
+  let filters = []
+  if (result.package.parentNumber) {
+    let packingNumber = result.package.parentNumber + "," + result.package.number;
+    filters.push({
+      column: "packingNumber",
+      action: "in",
+      value: packingNumber
+    })
+  } else {
+    filters.push({
+      column: "packingNumber",
+      action: "==",
+      value: result.package.number
+    })
+  }
+
+  filters.push({
+    column: "itemCode",
+    action: "==",
+    value: result.package.itemCode
+  })
+  filters.push({
+    column: "batch",
+    action: "==",
+    value: result.package.batch
+  })
+
+  filters.push({
+    column: "areaType",
+    action: "in",
+    value: toLocationAreaTypeList.value.join(',')
+  })
+
+
+  let params = {
+    filters: filters,
+    pageNo: 1,
+    pageSize: 100,
+  }
+  getBalanceByFilter(params).then(res => {
+    uni.hideLoading()
+    if (res.data.list.length > 0) {
+      showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+    } else {
+      queryBalance(result);
+    }
+    // callback(res.data)
+  }).catch(err => {
+    uni.hideLoading()
+    showErrorMessage(err.message);
+  })
+}
 const selectBalanceItem = (balance) => {
-  afterGetBalance(label.value, balance, packageInfo.value)
+  afterGetBalance(balance, balance, packageInfo.value)
 }
 
 const afterGetBalance = (label, balance, packageInfo) => {
@@ -232,34 +399,10 @@ const afterGetBalance = (label, balance, packageInfo) => {
     const packingCode = label.packingNumber
     const lot = label.batch
     const item = toLocation.value.Items.find((r) => r.itemCode == itemCode)
+    fromLocationCode.value = balance.locationCode;
     let fromLocation = item.Locations.find((l) => l.fromLocationCode == fromLocationCode.value)
     // 成品发货任务--同一物料，可以扫描提交不在任务中的库位
-    if(!fromLocation){
-      fromLocation = {
-        Batchs:[{
-          Recommends:[],
-          Records: [],
-          batch: label.batch,
-          detail:{
-            ...packageInfo,
-            fromLocationCode: balance.locationCode,
-            toLocationCode:toLocationCode.value
-          },
-          handleQty: 0,
-          packingNumber: null,
-          // packingNumber: label.packingNumber,
-          qty: label.qty,
-          uom: label.uom
-        }],
-        toLocationCode:toLocationCode.value,
-        fromLocationCode: balance.locationCode,
-        handleQty: 0,
-        qty: label.qty,
-        uom: label.uom
-      }
-      item.Locations.push(fromLocation)
-    }
-    if (fromLocation != undefined) {
+    if (fromLocation) {
       const batch = fromLocation.Batchs.find((r) => r.batch == lot)
       if (batch != undefined) {
         if (batch.Records == undefined) {
@@ -269,7 +412,7 @@ const afterGetBalance = (label, balance, packageInfo) => {
         const record = batch.Records.find((r) => r.packingNumber == packingCode)
         if (record == undefined) {
           // 如果有推荐箱码
-          if (batch.Recommends && batch.Recommends.length > 0) {
+          if (batch.Recommends  != undefined && batch.Recommends.length > 0) {
             const recommend = batch.Recommends.find((r) => r.packingNumber == packingCode)
             if (recommend != undefined) {
               addRecord(batch, label, balance, packageInfo)
@@ -280,6 +423,7 @@ const afterGetBalance = (label, balance, packageInfo) => {
               } else {
                 showErrorMessage(`未查找到该箱码【${packingCode}】的明细`, (res) => {
                   getfocus()
+                  return
                 })
               }
             }
@@ -295,7 +439,13 @@ const afterGetBalance = (label, balance, packageInfo) => {
         showQuestionMessage(`在【${fromLocationCode.value}】库位下,未查找到批次【${lot}】的发货明细,是否要继续发货?`, (res) => {
           if (res) {
             const batch = createBatchInfo(label, balance, packageInfo)
-            fromLocation.Batchs.unshift(batch)
+            //新增加的批次赋值details
+            if (fromLocation.Batchs.length > 0) {
+              batch.detail = fromLocation.Batchs[0].detail;
+            }
+            fromLocation.Batchs.unshift(batch);
+            getfocus();
+            emit("afterScan");
           }
         })
       } else {
@@ -304,9 +454,22 @@ const afterGetBalance = (label, balance, packageInfo) => {
         })
       }
     } else {
-      showErrorMessage(`未查找到推荐库位【${fromLocationCode.value}】的发货明细`, (res) => {
-        getfocus()
-      })
+      //扫描的不在任务列表中，询问是否可以添加，
+      if (jobContent.value.allowModifyLocation == "TRUE") {
+        this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + fromLocationCode.value +
+            "】与推荐的库位不一致,是否要继续发货?", res => {
+          if (res) {
+            let locaion = createLocationInfo(label, balance, packageInfo);
+            item.Locations.push(locaion);
+            getfocus();
+            emit("afterScan");
+          }
+        })
+
+      } else {
+        showErrorMessage("扫描物料[" + itemCode + "]的库位【" + fromLocationCode.value +
+            "】与推荐的库位不一致,不允许继续发货?")
+      }
     }
   } catch (e) {
     showErrorMessage(e.stack, (res) => {
@@ -314,27 +477,31 @@ const afterGetBalance = (label, balance, packageInfo) => {
     })
   }
 }
+//增加不是任务中的库位，实际扫描的明细
+const createLocationInfo = (label, balance, packageInfo)=> {
+  let location = {
+    fromLocationCode: balance.locationCode,
+    qty: balance.qty,
+    uom: balance.uom,
+    handleQty: 0,
+    isNewAdd: true,
+    Batchs: []
+  }
+  let batch = createBatchInfo(label, balance, packageInfo);
+  batch.detail = balance;
+  batch.detail.fromLocationCode = balance.locationCode;
+  location.Batchs.push(batch);
+  return location;
+}
+
 const createBatchInfo = (data, balance, packageInfo) => {
   const batch = {
+    isNewAdd: true,
     batch: data.lot || data.batch,
     qty: 0,
     uom: data.uom,
     handleQty: Number(data.qty),
     Records: [],
-    detail: {
-      fromLocationCode: fromLocationCode.value,
-      toLocationCode: toLocationCode.value,
-      itemCode: data.itemCode,
-      handleQty: Number(data.qty),
-      packingNumber: data.packingNumber,
-      qty: 0,
-      uom: data.uom,
-      itemName: packageInfo.itemName,
-      itemDesc1: packageInfo.itemDesc1,
-      itemDesc2: packageInfo.itemDesc2,
-      singlePrice: balance.singlePrice,
-      amount: balance.amount
-    }
   }
   const record = creatRecord(data, balance, packageInfo)
   batch.Records.push(record)
@@ -346,10 +513,13 @@ const creatRecord = (label, balance, packageInfo) => {
   balance.packQty = packageInfo.packQty
   balance.packUnit = packageInfo.packUnit
   const record = {
+    scaned: true,
     itemCode: label.itemCode,
     packingNumber: label.packingNumber,
+    parentPackingNumber: packageInfo.parentNumber,
     batch: label.batch,
-    qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+    qty: Number(balance.qty),
+    handleQty: Number(balance.qty),
     uom: balance.uom,
     inventoryStatus: balance.inventoryStatus,
     balance,
@@ -357,8 +527,6 @@ const creatRecord = (label, balance, packageInfo) => {
     supplierCode: label.supplierCode,
     packUnit: packageInfo.packUnit,
     packQty: packageInfo.packQty,
-    singlePrice: balance.singlePrice,
-    amount: balance.amount
   }
   return record
 }
@@ -371,11 +539,58 @@ const calcBatchHandleQty = (batch) => {
   batch.handleQty = handleQty
 }
 const addRecord = (batch, label, balance, packageInfo) => {
-  const record = creatRecord(label, balance, packageInfo)
-  batch.Records.push(record)
-  issueRecord.value.unshift(record)
-  calcBatchHandleQty(batch)
-  getfocus()
+  if (packageInfo.parentNumber) {
+    let checkData = batch.Records.find(r => {
+      if (r.packingNumber == packageInfo.parentNumber &&
+          r.batch == balance.batch) {
+        return r;
+      }
+    })
+    if (checkData) {
+      //提示已经扫描
+      showErrorMessage("箱码[" + packageInfo.number + "]批次[" + balance.batch +
+          "]的父包装已经扫描")
+    } else {
+      const record = creatRecord(label, balance, packageInfo)
+      batch.Records.push(record)
+      issueRecord.value.unshift(record)
+      calcBatchHandleQty(batch)
+      getfocus()
+      emit("afterScan");
+    }
+  } else {
+    //扫描的是父包装
+    var checkData = batch.Records.find(r => {
+      if (r.parentPackingNumber == packageInfo.number &&
+          r.batch == balance.batch) {
+        return r;
+      }
+    })
+    if (checkData) {
+      //是否移除
+      comMessageRef.value.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" +
+          balance
+              .batch + "]是父包装，是否移除子包装", res => {
+        if (res) {
+          batch.Records = [];
+          const record = creatRecord(label, balance, packageInfo)
+          batch.Records.push(record)
+          issueRecord.value.unshift(record)
+          calcBatchHandleQty(batch)
+          getfocus()
+          emit("afterScan");
+        }
+      })
+      console.log("扫描的是父包装，是否移除子包装")
+    } else {
+      const record = creatRecord(label, balance, packageInfo)
+      batch.Records.push(record)
+      issueRecord.value.unshift(record)
+      calcBatchHandleQty(batch)
+      getfocus()
+      emit("afterScan");
+    }
+  }
 }
 const getfocus = () => {
   if (!comscan.value) {
@@ -412,7 +627,7 @@ const edit = (item) => {
 
 const detail = (item) => {
   showItem.value = item
-  receiptHint.value.openScanPopup()
+  // receiptHint.value.openScanPopup()
 }
 const remove = (record, index) => {
   showQuestionMessage('确定移除扫描信息?', (res) => {
@@ -424,8 +639,10 @@ const remove = (record, index) => {
       if (item != undefined) {
         item.Locations.forEach((l) => {
           const batch = l.Batchs.find((b) => b.packingNumber == record.packingNumber && b.batch == record.batch)
-          const rIndex = batch.Records.findIndex((r) => r.packingNumber == record.packingNumber && r.batch == record.batch)
-          batch.Records.splice(rIndex, 1)
+          if (batch && batch.Records && batch.Records.length > 0) {
+            const rIndex = batch.Records.findIndex((r) => r.packingNumber == record.packingNumber && r.batch == record.batch)
+            batch.Records.splice(rIndex, 1)
+          }
         })
       }
       emit('updateData', item)
@@ -434,10 +651,14 @@ const remove = (record, index) => {
 }
 
 const packGetFocus = () => {
-  comscan.value.getfocus()
+  if(comscan.value){
+    comscan.value.getfocus()
+  }
 }
 const packLoseFocus = () => {
-  comscan.value.losefocus()
+  if(comscan.value){
+    comscan.value.losefocus()
+  }
 }
 const showMessage = (message, callback) => {
   setTimeout((r) => {
@@ -465,7 +686,7 @@ const cancle = () => {
   closeScanPopup()
 }
 // 传递给父类
-const emit = defineEmits(['updateData', 'closeScan'])
+const emit = defineEmits(['updateData', 'closeScan','afterScan'])
 defineExpose({
   openScanPopup
 })
@@ -486,4 +707,7 @@ button::after {
   max-height: 300rpx;
   padding: 10rpx;
 }
+.my-combox {
+  font-size: 50px;
+}
 </style>
diff --git a/src/pages/deliver/coms/comScanDeliverPackBatch.vue b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
new file mode 100644
index 00000000..5c0d2667
--- /dev/null
+++ b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
@@ -0,0 +1,564 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title uni-flex space-between">
+						<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>
+						</view>
+					</view>
+
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<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;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:headerType="headerType" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: [],
+				packageInfo: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				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.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.losefocus()
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
+					that.toLocation =that.dataContent.subList;
+					that.toLocationCode = that.dataContent.subList[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items, packageInfo) {
+				this.packageInfo = packageInfo;
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.subList.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					this.dataContent.subList.forEach(item => {
+						list.push(item.fromLocationCode)
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+				// if (location == undefined) {
+					this.fromLocationCode = fromlocation
+				// 	this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				// }
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item =  that.toLocation.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.label = result.label;
+										this.showBalanceSelect(balanceRes.data.list, packageInfo);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(balance, balance, this.packageInfo);
+			},
+
+
+			afterGetBalance(label, balance, packageInfo) {
+				let that = this;
+				try {
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.find(r => r.itemCode == itemCode);
+					// item.scaned =true
+					let fromLocation = that.toLocation.find(l => l.fromLocationCode == that.fromLocationCode);
+					// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+					if(!fromLocation){
+						fromLocation = {
+							Batchs:[{
+								Recommends:[],
+								Records: [],
+								batch: label.batch,
+								detail:{
+									...packageInfo,
+									fromLocationCode: balance.locationCode,
+									toLocationCode:this.toLocationCode
+								},
+								handleQty: 0,
+								packingNumber: null,
+								// packingNumber: label.packingNumber,
+								qty: label.qty,
+								uom: label.uom
+							}],
+							toLocationCode:this.toLocationCode,
+							fromLocationCode: balance.locationCode,
+							handleQty: 0,
+							qty: label.qty,
+							uom: label.uom
+						}
+						item.Locations.push(fromLocation)
+					}
+					if (fromLocation != undefined) {
+						let batch = fromLocation.batch;
+						if (batch != undefined) {
+							that.addRecord(item.batch, label, balance, packageInfo)
+						} else {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance,packageInfo);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance, packageInfo) {
+				let batch = {
+					batch: data.lot||data.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: [],
+					detail:{
+						fromLocationCode:this.fromLocationCode, //balance.locationCode
+						toLocationCode:this.toLocationCode,
+						itemCode:data.itemCode,
+						handleQty: Number(data.qty),
+						packingNumber:data.packingNumber,
+						qty: 0,
+						uom:data.uom,
+						itemName:packageInfo.itemName,
+						itemDesc1:packageInfo.itemDesc1,
+						itemDesc2:packageInfo.itemDesc2,
+						singlePrice:balance.singlePrice,
+						amount:balance.amount
+					}
+				}
+				let record = this.creatRecord(data, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.packQty = packageInfo.packQty
+				balance.packUnit = packageInfo.packUnit
+				let record = {
+				scaned: true,
+				itemCode: label.itemCode,
+				packingNumber: label.packingNumber,
+				parentPackingNumber: packageInfo.parentNumber,
+				batch: label.batch,
+				// qty: Number(balance.qty),
+				// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+				qty: Number(balance.qty),
+				handleQty:0,
+				uom: balance.uom,
+				inventoryStatus: balance.inventoryStatus,
+				balance: balance,
+				toLocationCode: this.toLocationCode,
+				supplierCode: label.supplierCode,
+				packUnit: packageInfo.packUnit,
+				packQty: packageInfo.packQty,
+				fromLocationCode:balance.locationCode,
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch,label,balance) {
+				this.dataContent.subList.forEach(item => {
+					if(item.itemCode == label.itemCode&&item.batch == label.batch){
+						item.handleQty = item.handleQty || 0
+						item.handleQty = calc.add(item.handleQty, label.qty);
+					}
+				})
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				var checkData = this.dataContent.subList.find(r => {
+					if (r.batch == balance.batch) {
+						return r;
+					}
+				})
+				if (checkData) {
+					checkData.scaned = true
+					this.calcBatchHandleQty(batch,label,balance);
+					this.getfocus();
+				} else {
+					let record = this.creatRecord(label, balance, packageInfo);
+					this.dataContent.subList.push(record);
+					this.calcBatchHandleQty(batch,label,balance);
+					this.getfocus();
+					this.$emit("afterScan");
+				}
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/src/pages/deliver/coms/comScanDeliverPackss.vue b/src/pages/deliver/coms/comScanDeliverPackss.vue
new file mode 100644
index 00000000..b5ad7bfb
--- /dev/null
+++ b/src/pages/deliver/coms/comScanDeliverPackss.vue
@@ -0,0 +1,582 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title uni-flex space-between">
+						<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>
+						</view>
+					</view>
+
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<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;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:headerType="headerType" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: [],
+				packageInfo: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				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.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.losefocus()
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
+					that.toLocation = that.dataContent[0];
+					that.toLocationCode = that.dataContent[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items, packageInfo) {
+				this.packageInfo = packageInfo;
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					location.Items.forEach(item => {
+						item.Locations.forEach(f => {
+							list.push(f.fromLocationCode)
+						})
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+				// if (location == undefined) {
+					this.fromLocationCode = fromlocation
+				// 	this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				// }
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.label = result.label;
+										this.showBalanceSelect(balanceRes.data.list, packageInfo);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(balance, balance, this.packageInfo);
+			},
+
+
+			afterGetBalance(label, balance, packageInfo) {
+				let that = this;
+				try {
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
+					let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
+					// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+					if(!fromLocation){
+						fromLocation = {
+							Batchs:[{
+								Recommends:[],
+								Records: [],
+								batch: label.batch,
+								detail:{
+									...packageInfo,
+									fromLocationCode: balance.locationCode,
+									toLocationCode:this.toLocationCode
+								},
+								handleQty: 0,
+								packingNumber: null,
+								// packingNumber: label.packingNumber,
+								qty: label.qty,
+								uom: label.uom
+							}],
+							toLocationCode:this.toLocationCode,
+							fromLocationCode: balance.locationCode,
+							handleQty: 0,
+							qty: label.qty,
+							uom: label.uom
+						}
+						item.Locations.push(fromLocation)
+					}
+					if (fromLocation != undefined) {
+						let batch = fromLocation.Batchs.find(r => r.batch == lot);
+						if (batch != undefined) {
+							if (batch.Records == undefined) {
+								batch.Records = [];
+							}
+
+							let record = batch.Records.find(r => r.packingNumber == packingCode);
+							if (record == undefined) {
+								//如果有推荐箱码
+								if (batch.Recommends&&batch.Recommends.length > 0) {
+									let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
+									if (recommend != undefined) {
+										that.addRecord(batch, label, balance, packageInfo)
+									} else {
+										//允许修改箱码
+										if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
+											that.addRecord(batch, label, balance, packageInfo);
+										} else {
+											that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
+												res => {
+													that.getfocus();
+												}
+											)
+										}
+									}
+								} else {
+									that.addRecord(batch, label, balance, packageInfo)
+								}
+							} else {
+								that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
+									res => {
+										that.getfocus();
+									}
+								)
+							}
+						} else {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance,packageInfo);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance, packageInfo) {
+				let batch = {
+					batch: data.lot||data.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: [],
+					detail:{
+						fromLocationCode:this.fromLocationCode, //balance.locationCode
+						toLocationCode:this.toLocationCode,
+						itemCode:data.itemCode,
+						handleQty: Number(data.qty),
+						packingNumber:data.packingNumber,
+						qty: 0,
+						uom:data.uom,
+						itemName:packageInfo.itemName,
+						itemDesc1:packageInfo.itemDesc1,
+						itemDesc2:packageInfo.itemDesc2,
+						singlePrice:balance.singlePrice,
+						amount:balance.amount
+					}
+				}
+				let record = this.creatRecord(data, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.packQty = packageInfo.packQty
+				balance.packUnit = packageInfo.packUnit
+				let record = {
+					scaned: true,
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode,
+					packUnit: packageInfo.packUnit,
+					packQty: packageInfo.packQty,
+					singlePrice:balance.singlePrice,
+					amount:balance.amount
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch) {
+				let handleQty = 0;
+				batch.Records.forEach(res => {
+					handleQty = calc.add(handleQty, res.qty)
+				})
+				batch.handleQty = handleQty;
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				let record = this.creatRecord(label, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				this.calcBatchHandleQty(batch);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>