diff --git a/src/pages/inspect/job/inspectJob.vue b/src/pages/inspect/job/inspectJob.vue
index f01ab9fe..baadc5ce 100644
--- a/src/pages/inspect/job/inspectJob.vue
+++ b/src/pages/inspect/job/inspectJob.vue
@@ -112,7 +112,7 @@ export default {
       if (this.checkedToday) {
         filters.push({
           column: 'create_time',
-          action: 'betweeen',
+          action: 'between',
           value: this.todayTime
         })
       }
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 40205d0c..94e7d2c8 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -4,7 +4,10 @@
       <u-collapse-item :open="true">
         <template v-slot:title>
           <view style="flex: 1">
-            <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+<!--            <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>-->
+            <item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+                              :isShowStdPack="false">
+            </item-compare-qty>
           </view>
         </template>
         <view class="split_line"></view>
@@ -23,6 +26,7 @@
 <script setup lang="ts">
 import { ref, onMounted, nextTick, watch } from 'vue'
 import itemQty from '@/mycomponents/item/itemQty.vue'
+import ItemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 import recommend from '@/mycomponents/recommend/recommend.vue'
 import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 753a8b47..329282a4 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -124,7 +124,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index ed7e3e69..7c9f4924 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -9,7 +9,11 @@
         <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-move-record-card :dataContent="item" :index="index" @removeData="removeData" :isShowStatus="isShowStatus" @updateData="updateData" @removePack="removePack" :allowEditStatus="allowEditStatus"> </com-move-record-card>
+              <com-move-record-card :dataContent="item" :index="index"
+                                    @removeData="removeData" :isShowStatus="isShowStatus"
+                                    @updateData="updateData" @removePack="removePack"
+                                    :allowEditQty="true" :allowEditStatus="allowEditStatus">
+              </com-move-record-card>
             </view>
           </view>
         </scroll-view>
@@ -26,10 +30,20 @@
           </view>
         </view>
       </view>
-      <win-scan-button @goScan="openScanPopup"></win-scan-button>
+      <win-scan-button @goScan="showFromLocationPopup"></win-scan-button>
     </view>
-    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :title="'箱码'"> </win-scan-pack-and-location>
-    <win-scan-location ref="scanFromLocationCode" title="来源库位" @getLocation="getFromLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <okToHoldRecordPack ref="okToHoldRecordPackRef" :showOnePop='showOnePop'
+                        @showFromLocationPopup='showFromLocationPopup'
+                        @itemCodeClick='openScanPopup' @confirm='okToHoldRecordPackConfirm'
+                        @getInputMsgResult="getInputMsgResult" @itemCodeScanMsg='itemCodeScanMsg'
+                        @clickBtnClearFromLocation='clearFromLocation'
+                        @clickBtnClearItemCode='clearItemCode'>
+    </okToHoldRecordPack>
+    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" @clearItemCode='clearItemCode' :title="'箱码'"></win-scan-pack-and-location>
+    <win-scan-location ref="scanFromLocationCode" title="来源库位"
+                       @getLocation="getFromLocation" :locationAreaTypeList="fromLocationAreaTypeList"
+                       @clearFromLocation='clearFromLocation'>
+    </win-scan-location>
     <com-message ref="comMessageRef" />
   </view>
 </template>
@@ -44,12 +58,15 @@ import comMoveRecordCard from '@/pages/inventoryMove/coms/comMoveRecordCard.vue'
 import comBlankView from '@/mycomponents/common/comBlankView.vue'
 import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
 import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
+import OkToHoldRecordPack from '@/pages/inventoryMove/coms/okToHoldRecordPack.vue'
 import { inventoryMoveRecordSubmit, getBasicLocationByCode } from '@/api/request2.js'
 
 import { getDirectoryItemArray,getInventoryStatusName } from '@/common/directory.js'
 
 import { getPrecisionStrategyList } from '@/common/balance.js'
-
+import {
+  calc
+} from '@/common/calc.js';
 import { getPackingNumberAndBatchByList, deepCopyData } from '@/common/basic.js'
 
 import { getBusinessType, createItemInfo, createDetailInfo, calcHandleQty } from '@/common/record.js'
@@ -73,7 +90,12 @@ const props = defineProps({
   myTitle: {
     type: String,
     default: ''
-  }
+  },
+  // 是否显示第一层弹窗
+  showOnePop: {
+    type: Boolean,
+    default: false
+  },
 })
 const fromLocationCode = ref('')
 const fromLocationInfo = ref({})
@@ -89,6 +111,8 @@ const fromLocationAreaTypeList = ref([])
 const toLocationAreaTypeList = ref([])
 const isShowEditLocation = ref(false)
 const scanFromLocationCode = ref()
+const getResult = ref({})
+const managementType = ref('')
 
 const scanPopup = ref()
 const businessTypeCode = ref(props.businessTypeCode)
@@ -96,6 +120,7 @@ const managementList = ref()
 const comMessageRef = ref()
 const subList = ref([])
 const toWarehouseCode = ref('')
+const okToHoldRecordPackRef = ref(null)
 onMounted(() => {
   getBusinessType(props.businessTypeCode, (res) => {
     if (res.success) {
@@ -182,20 +207,70 @@ const openScanPopup = () => {
   scanPopup.value.openScanPopupForType(fromLocationCode.value, businessType.value)
 }
 const showFromLocationPopup = () => {
-  nextTick(() => {
-    scanFromLocationCode.value.openScanPopup()
-  })
+  setTimeout(()=>{
+    if(props.showOnePop){
+      okToHoldRecordPackRef.value.fromLocationCode = ''
+      okToHoldRecordPackRef.value.itemCode = ''
+      okToHoldRecordPackRef.value.batch = ''
+      okToHoldRecordPackRef.value.handleQty = 0
+      okToHoldRecordPackRef.value.showOne = true
+
+    }else{
+      scanFromLocationCode.value.openScanPopup()
+    }
+  },200)
 }
 const getFromLocation = (location) => {
   fromLocationCode.value = location.code
   fromLocationInfo.value = location
-  openScanPopup()
+  if(!props.showOnePop){
+    openScanPopup()
+  }else{
+    // 无定义对象
+    // itemCode.value =''
+    // batch.value =''
+  }
 }
 const getToLocation = (location, code) => {
   toLocationCode.value = code
   toLocationInfo.value = location
 }
-const getScanResult = (result) => {
+const getScanResult = (result,managementTypeParams)=> {
+  managementType.value = managementTypeParams
+  if(props.showOnePop){
+    okToHoldRecordPackRef.value.itemCode= result.balance.itemCode
+    okToHoldRecordPackRef.value.batch =  result.balance.batch
+    getResult.value = result//存储接受的结果
+    scanPopup.value.closeScanPopup()
+
+  }else{
+    if(managementTypeParams == "BY_BATCH" ||managementTypeParams == "BY_QUANTITY" ){
+      getScanResultAfterBatch(result,managementTypeParams)
+    }else{
+      getScanResultAfter(result,managementTypeParams)
+    }
+  }
+}
+const okToHoldRecordPackConfirm = (obj)=>{
+  // this.getResult. = result//存储接受的结果
+  if(!obj.fromLocationCode){
+    comMessageRef.value.showErrorMessage('请选择来源库位');
+    return;
+  }
+  if(!obj.itemCode){
+    comMessageRef.value.showErrorMessage('请选择零件');
+    return;
+  }
+  if(!obj.handleQty){
+    comMessageRef.value.showErrorMessage('请输入数量');
+    return;
+  }
+  // this.getResult.fromLocationCode = obj.fromLocationCode
+  getResult.value.label.batch = obj.handleQty
+  getResult.value.label.qty = obj.handleQty
+  getScanResultAfterBatch(getResult.value,managementType.value)
+}
+const getScanResultAfter = (result) => {
   const { balance } = result
   const pack = result.package
   const item = detailSource.value.find((res) => {
@@ -250,6 +325,114 @@ const getScanResult = (result) => {
   }
   calcHandleQty(detailSource.value)
 }
+const getScanResultAfterBatch = (result,managementTypeParams)=> {
+  const balance = result.balance;
+  const balanceInfo = result.balance;
+  const pack = result.package;
+  let item = detailSource.value.find(res => {
+    if (res.itemCode == balance.itemCode) {
+      return res
+    }
+  })
+  if (item == undefined) {
+    let itemp = createItemInfo(balance, pack);
+    let newDetail = createDetailInfo(balance, pack);
+
+    if (newDetail.packingNumber == '') {
+      newDetail.packingNumber = pack.number;
+    }
+
+    if (businessTypeCode.value == "Move") {
+      newDetail.toInventoryStatus = balance.inventoryStatus;
+    } else {
+      newDetail.toInventoryStatus = toInventoryStatus.value;
+    }
+    newDetail.toLocationCode = toLocationCode.value;
+    newDetail.managementTypeParams = managementTypeParams;
+    newDetail.fromLocationCode = result.fromLocationCode
+    newDetail.handleQty = Number(result.label.qty)
+    itemp.subList.push(newDetail);
+    detailSource.value.push(itemp)
+
+    clearFromLocation()
+    okToHoldRecordPackRef.value.handleQty = 0
+    okToHoldRecordPackRef.value.showOne = false
+  } else {
+    let detail = ''
+    console.log(9988,managementTypeParams)
+    if(managementTypeParams == 'BY_QUANTITY'){
+      detail = item.subList.find(r => {
+        if (r.fromLocationCode == balance.locationCode &&
+            r.scaned == true) {
+          return r;
+        }
+      })
+    }else if(managementTypeParams == 'BY_BATCH'){
+      detail = item.subList.find(r => {
+        if (r.batch == pack.batch &&
+            r.fromLocationCode == balance.locationCode &&
+            r.scaned == true) {
+          return r;
+        }
+      })
+    }
+    console.log(detail)
+    if (detail == undefined) {
+      let newDetail = createDetailInfo(balance, pack);
+      // newDetail.inventoryStatus = balance.inventoryStatus;
+      if (businessTypeCode.value == "Move") {
+        newDetail.toInventoryStatus = balance.inventoryStatus;
+      } else {
+        newDetail.toInventoryStatus = toInventoryStatus.value;
+      }
+
+      if (newDetail.packingNumber == '') {
+        newDetail.packingNumber = pack.number;
+      }
+      newDetail.toLocationCode = toLocationCode.value;
+      newDetail.managementTypeParams = managementTypeParams;
+      newDetail.fromLocationCode = result.fromLocationCode
+      item.subList.push(newDetail);
+      clearFromLocation()
+      okToHoldRecordPackRef.value.handleQty = 0
+      okToHoldRecordPackRef.value.showOne = false
+    } else {
+      // console.log(999,detail.handleQty)
+      // detail.handleQty =calc.add(detail.handleQty, result.label.qty)
+      if(managementTypeParams == 'BY_QUANTITY'){
+        showErrorMessage(
+            "批次[]\n" + "库位[" + detail.fromLocationCode + "]\n" +
+            "已经存在")
+      }else if(managementTypeParams == 'BY_BATCH'){
+        showErrorMessage(
+            "批次[" + detail.batch + "]\n" + "库位[" + detail.fromLocationCode + "]\n" +
+            "已经存在")
+      }
+    }
+  }
+  calcHandleQty(detailSource);
+}
+const getInputMsgResult = (result,fromWitch)=> {
+  if(fromWitch == 'fromLocationScanMsg'){
+    // isClearFromLocationCode = false//未找到变量
+    scanFromLocationCode.value.getScanResult(result)
+  }else if(fromWitch == 'itemCodeScanMsg'){
+    result.fromLocationCode = fromLocationCode.value
+    scanPopup.value.getScanResult(result)
+  }
+}
+// 清除来源库位
+const clearFromLocation = (fromLocationCodeParams)=>{
+  okToHoldRecordPackRef.value.fromLocationCode = ''
+  okToHoldRecordPackRef.value.itemCode =''
+  okToHoldRecordPackRef.value.batch =''
+  // this.isClearFromLocationCode = true
+}
+// 清除批次和物料
+const clearItemCode = (label)=>{
+  okToHoldRecordPackRef.value.itemCode =''
+  okToHoldRecordPackRef.value.batch =''
+}
 const showErrorMessage = (message) => {
   if(scanPopup.value){
     scanPopup.value.packLoseFocus()
@@ -349,6 +532,12 @@ const submit = ()=>{
     return;
   }
   // console.log("提交" + JSON.stringify(params))
+  let obj = params.subList.find(item=>item.balanceQty < item.handleQty)
+  if(obj){
+    comMessageRef.value.showConfirmWarningModal('批次[' +obj.batch + ']数量[' + obj.handleQty + ']不允许大于库存数量[' +obj.balanceQty + ']')
+    uni.hideLoading()
+    return
+  }
   inventoryMoveRecordSubmit(params)
     .then((res) => {
       uni.hideLoading()
@@ -405,7 +594,7 @@ const setParams = () => {
 
         submitItem.fromPackingNumber = info.packingNumber
         submitItem.toPackingNumber = info.packingNumber
-
+        submitItem.packingNumber = info.packingNumber;
         submitItem.fromContainerNumber = detail.containerNumber
         submitItem.toContainerNumber = detail.containerNumber
 
diff --git a/src/pages/inventoryMove/coms/comMoveRecordCard.vue b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
index 93810398..48d18ee6 100644
--- a/src/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -28,7 +28,12 @@
 					<view class='split_line'></view>
 				</view> -->
         <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in dataContent.subList" :key="index" :options="item.scaned ? scanOptions : detailOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, item)">
-          <comMovebalance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :fromInventoryStatus="item.inventoryStatus" :toInventoryStatus="item.toInventoryStatus" :isShowLocation="true" :allowEditStatus="allowEditStatus" :allowEditQty="allowEditQty"></comMovebalance>
+          <comMovebalance :dataContent="item" :isShowStdPack="false"
+                          :fromInventoryStatus="item.inventoryStatus"
+                          :toInventoryStatus="item.toInventoryStatus"
+                          :isShowLocation="true" :allowEditStatus='allowEditStatus'
+                          :isShowPack='item.managementTypeParams == "BY_PACKAGING"'>
+          </comMovebalance>
         </u-swipe-action>
       </u-collapse-item>
     </u-collapse>
diff --git a/src/pages/inventoryMove/coms/okToHoldRecordPack.vue b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
new file mode 100644
index 00000000..22d45d2b
--- /dev/null
+++ b/src/pages/inventoryMove/coms/okToHoldRecordPack.vue
@@ -0,0 +1,261 @@
+<template>
+  <view class="">
+    <u-popup v-model="showOne" mode="bottom" border-radius="14" z-index='12'>
+      <view class="title">
+        <view class="title-txt">
+          需求信息
+        </view>
+        <u-icon name="close" color="#4f4f4f" size="28" @click="showOne = false"></u-icon>
+      </view>
+      <view class="item">
+        <view class="label">来源库位：</view>
+        <view class="value">
+          <u-input v-model="fromLocationCode" @blur="fromLocationScanMsg"></u-input>
+          <u-icon name="close-circle-fill" color="#acacac" size="36" @click="clickBtnClearFromLocation"></u-icon>
+        </view>
+        <view class="searchIcon">
+          <image src="/static/search.svg" mode="" @click="fromLocationClick"/>
+        </view>
+      </view>
+      <view class="item">
+        <view class="label">零件：</view>
+        <view class="value">
+          <u-input v-model="itemCode" @blur="itemCodeScanMsg"></u-input>
+          <u-icon name="close-circle-fill" color="#acacac" size="36" @click="clickBtnClearItemCode"></u-icon>
+        </view>
+        <view class="searchIcon">
+          <image src="/static/search.svg" mode="" @click="itemCodeClick"/>
+        </view>
+      </view>
+      <view class="item">
+        <view class="label">批次：</view>
+        <view class="value">
+          <u-input v-model='batch'></u-input>
+          <u-icon name="close-circle-fill" color="#acacac" size="36" @click="batch = ''"></u-icon>
+        </view>
+        <view class="searchIcon"></view>
+      </view>
+      <view class="item">
+        <view class="label">数量：</view>
+        <view class="value1">
+          <u-number-box v-model="handleQty" @change="valChange"></u-number-box>
+          <view class="uom">EA</view>
+        </view>
+      </view>
+      <view class="uni-flex uni-row hide_border">
+        <button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="showOne = false">取消</button>
+        <button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
+      </view>
+    </u-popup>
+
+    <!-- <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getFromLocation'
+      :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location> -->
+    <comMessage ref="comMessage"></comMessage>
+  </view>
+</template>
+
+<script setup>
+import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+import {
+  getBusinessType
+} from '@/common/record.js';
+
+import {
+  getLabelInfo
+} from '@/common/label.js';
+
+
+import {ref, onMounted} from 'vue';
+
+const props = defineProps({
+  showOnePop: {
+    type: Boolean,
+    default: false
+  }
+});
+
+const handleQty = ref(0)
+const fromLocationCode = ref('')
+const itemCode = ref('')
+const batch = ref('')
+const showOne = ref(false)
+// 未定义字段
+const boxfocus = ref(false)
+const scanMsg = ref('')
+const fromWitch = ref('')
+const scanList = ref([])
+const isShowHistory = ref('')
+const headerType = ref('')
+
+const scanLocationCode = ref(null);
+const comMessage = ref(null);
+
+const emit = defineEmits(['showFromLocationPopup', 'itemCodeClick', 'confirm', 'getInputMsgResult', 'clickBtnClearFromLocation', 'clickBtnClearItemCode']);
+
+onMounted(() => {
+});
+
+const fromLocationClick = () => {
+  emit('showFromLocationPopup');
+};
+
+const itemCodeClick = () => {
+  if (!fromLocationCode.value) {
+    comMessage.value.showMessage("请先扫描来源库位");
+    return;
+  }
+  emit('itemCodeClick');
+};
+
+const confirm = () => {
+  const obj = {
+    fromLocationCode: fromLocationCode.value,
+    itemCode: itemCode.value,
+    batch: batch.value,
+    handleQty: handleQty.value,
+  };
+  emit('confirm', obj);
+};
+
+const fromLocationScanMsg = () => {
+  if (fromLocationCode.value) {
+    scanMsg.value = fromLocationCode.value;
+    fromWitch.value = 'fromLocationScanMsg';
+    handelScanMsg();
+  }
+};
+
+const itemCodeScanMsg = () => {
+  if (itemCode.value) {
+    if (!fromLocationCode.value) {
+      comMessage.value.showMessage("请先扫描来源库位");
+      return;
+    }
+    fromWitch.value = 'itemCodeScanMsg';
+    scanMsg.value = itemCode.value;
+    handelScanMsg();
+  }
+};
+
+const handelScanMsg = () => {
+  if (scanMsg.value) {
+    setTimeout(() => {
+      losefocus();
+      let content = uni.$u.trim(scanMsg.value);
+      if (content === "") {
+        comMessage.value.showErrorMessage("扫描内容为空,请重新扫描", res => {
+          if (res) {
+            scanMsg.value = "";
+            getfocus();
+          }
+        });
+        return;
+      }
+
+      if (isShowHistory.value) {
+        scanList.value.unshift(content);
+      }
+
+      getLabelInfo(content, headerType.value, callback => {
+        let scanResult = callback;
+        scanResult.scanMessage = content;
+        if (scanResult.success) {
+          console.log(scanResult);
+          emit('getInputMsgResult', scanResult, fromWitch.value);
+        } else {
+          losefocus();
+          comMessage.value.showErrorMessage(scanResult.message, res => {
+            if (res) {
+              getfocus();
+            }
+          });
+        }
+      });
+    }, 200);
+  }
+};
+
+const losefocus = () => {
+  boxfocus.value = false;
+};
+
+const clickBtnClearFromLocation = () => {
+  emit('clickBtnClearFromLocation');
+};
+
+const clickBtnClearItemCode = () => {
+  emit('clickBtnClearItemCode');
+};
+</script>
+
+<style lang="scss">
+.title {
+  padding: 30rpx 20rpx;
+  display: flex;
+  border-bottom: 1px solid rgba(230, 230, 230, 1);
+
+  .title-txt {
+    flex: 1;
+    font-weight: bold;
+    font-size: 32rpx;
+  }
+
+}
+
+.select {
+  display: flex;
+}
+
+.border {
+  border: 1px solid rgba(230, 230, 230, 1)
+}
+
+::v-deep .u-input__right-icon__clear {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #a7a7a7;
+}
+
+.item {
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  border-bottom: 1px solid #dedede;
+
+  .value {
+    flex: 1;
+    width: 0px;
+    height: 80rpx;
+    border: 1px solid #dedede;
+    display: flex;
+    align-items: center;
+    font-size: 32rpx;
+    padding: 0px 20rpx;
+  }
+
+  .value1 {
+    flex: 1;
+    width: 0px;
+    height: 80rpx;
+    display: flex;
+    align-items: center;
+    font-size: 32rpx;
+  }
+
+  .searchIcon {
+    width: 40rpx;
+    margin-left: 20rpx;
+
+    image {
+      width: 40rpx;
+      height: 40rpx
+    }
+  }
+
+  .uom {
+    margin-left: 10rpx;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 9149cd3e..7b5a3869 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -12,15 +12,10 @@
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
           <view class="">
-            <comInventoryDetailCardBatch  :dataContent="item" :settingParam="jobContent" @remove="updateData"
-                                          @updateData='updateData'
-                                          :locationAreaTypeList="toLocationAreaTypeList"
-                                          @openDetail="openDetail"  v-if="managementType=='BY_BATCH'">
-            </comInventoryDetailCardBatch>
             <comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
                                     @updateData='updateData' :locationAreaTypeList="toLocationAreaTypeList"
                                     :allowEditQty ="jobContent.allowModifyQty=='TRUE'?true:false"
-                                    @openDetail="openDetail" v-else>
+                                    @openDetail="openDetail">
             </comInventoryDetailCard>
           </view>
         </view>
@@ -48,14 +43,15 @@ import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 import { getInventoryMoveJobDetail, takeInventoryMoveJob, cancleTakeInventoryMoveJob, inventoryMoveSubmit } from '@/api/request2.js'
 import { getManagementPrecisions, getPrecisionStrategyList } from '@/common/balance.js'
-
+import {
+  calc
+} from '@/common/calc.js';
 import { getDataSource, getScanCount, calcHandleQty } from '@/common/detail.js'
 import { goHome, navigateBack, getCurrDateTime, getPackingNumberAndBatchByList, getInventoryStatusName } from '@/common/basic.js'
 import {getDirectoryItemArray} from '@/common/directory.js';
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 import winScanPack from '@/mycomponents/scan/winScanPack.vue'
 import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
-import comInventoryDetailCardBatch from '@/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue'
 import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
 import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
 import jobTop from '@/mycomponents/job/jobTop.vue'
@@ -257,8 +253,90 @@ const openScanPopup = () => {
 
   scanPopup.value.openScanPopupForJob(fromlocationCode, fromlocationList, jobContent.value)
 }
+const getScanResult = (result,managementPrecision)=> {
+  managementType.value = managementPrecision
+  if(managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY' ){
+    setDataBatch(result,managementPrecision)
+  }else{
+    setData(result,managementPrecision)
+  }
 
-const getScanResult = (result,managementPrecision) => {
+}
+const setDataBatch = (result,managementPrecision)=>{
+  try {
+    let packingNumber = result.label.packingNumber;
+    let batch = result.label.batch;
+    let qty = result.label.qty;
+    let itemCode = result.label.itemCode;
+    let detail = detailSource.value.find(r => r.itemCode == itemCode);
+    if (detail == undefined) {
+      showMessage("物料号【" + itemCode + "】不在列表中")
+    } else {
+      let itemDetail = {}
+      if(managementPrecision == 'BY_QUANTITY'){
+        itemDetail = detail.subList.find(r => {
+          return r.itemCode == result.label.itemCode
+        })
+      }else{
+        itemDetail = detail.subList.find(r => {
+          return r.batch == batch
+        })
+      }
+
+      if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
+        showErrorMessage( "批次[" + batch + "]不在列表中")
+      } else {
+        if (itemDetail.scaned) {
+          // this.showMessage("批次【" + batch + "】已经扫描")
+          itemDetail.handleQty = calc.add(itemDetail.handleQty,Number(result.label.qty));
+          calcHandleQty();
+        } else {
+          let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+          let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+          if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+            if (jobContent.value.allowModifyInventoryStatus == "TRUE") {
+              showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+                  itemStatus +
+                  ']不一致,是否继续转移?', res => {
+                if (res) {
+                  itemDetail.scaned = true;
+                  itemDetail.handleQty = Number(result.label.qty);
+                  itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+                  itemDetail.balance = result.balance;
+                  itemDetail.balance.balanceQty = Number(result.balance.qty);
+                  itemDetail.balance.packQty = Number(result.package.packQty)
+                  itemDetail.balance.packUnit = result.package.packUnit
+                  calcHandleQty();
+                } else {
+                  scanPopupGetFocus();
+                }
+              });
+            } else {
+              showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+                  itemStatus +
+                  ']不一致,不允许转移!', res => {
+                scanPopupGetFocus();
+              });
+            }
+          } else {
+            itemDetail.scaned = true;
+            itemDetail.handleQty = Number(result.label.qty);
+            itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+            itemDetail.balance = result.balance;
+            itemDetail.balance.balanceQty = Number(result.balance.qty);
+            itemDetail.balance.packQty = Number(result.package.packQty)
+            itemDetail.balance.packUnit = result.package.packUnit
+            calcHandleQty();
+          }
+        }
+      }
+    }
+    scanPopupGetFocus();
+  } catch (e) {
+    showErrorMessage(e.message);
+  }
+}
+const setData = (result,managementPrecision) => {
   try {
     const { packingNumber } = result.label
     const { batch } = result.label
@@ -324,22 +402,43 @@ const getScanResult = (result,managementPrecision) => {
   }
 }
 
-const commit = () => {
+const commit = async () => {
   scanCount.value = getScanCount(subList.value)
 
   if (scanCount.value == 0) {
     showErrorMessage('扫描数为0,请先扫描')
     return
   }
+  //查询管理模式
+  managementList.value = [];
+  let precisionStrategParams = setPrecisionStrategParams()
+  await getPrecisionStrategyList(precisionStrategParams, res => {
+    if (res.success) {
+      managementList.value = res.list;
+      managementType.value = managementList.value&& managementList.value[0]&& managementList.value[0].ManagementPrecision ? managementList.value[0].ManagementPrecision : 'BY_PACKAGING'
+      console.log(11,this.managementType)
+    } else {
+      uni.hideLoading();
+      showErrorMessage(res.message);
+    }
+  })
   //允许部分提交
   //扫描数量和任务数量相等，直接提交
   if (scanCount.value == subList.value.length) {
-    checkCount();
+    if(managementType.value == 'BY_BATCH' || managementType.value == 'BY_QUANTITY'){
+      checkCountBatch();
+    }else{
+      checkCount();
+    }
   } else if (scanCount.value < subList.value.length) {
     //扫描数量小于任务数量，判断是否允许部分提交
     if (jobContent.value.allowPartialComplete == "TRUE") {
       //提交
-      checkCount();
+      if(managementType.value == 'BY_BATCH' || managementType.value == 'BY_QUANTITY' ){
+        checkCountBatch();
+      }else{
+        checkCount();
+      }
     } else {
       //不允许部分提交，提示
       comMessageRef.value.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
@@ -377,39 +476,67 @@ const checkCount = ()=>{
     submitJob()
   }
 }
+const checkCountBatch = ()=> {
+  // 提交的数量和任务数量不一致提示
+  let str = ''
+  let str1 = ''
+  detailSource.value.forEach((item) => {
+    item.subList.forEach(cur => {
+      if (cur.qty != cur.handleQty) {
+        let tempHandleQty = 0
+        if (cur.handleQty) {
+          tempHandleQty = cur.handleQty
+        } else {
+          tempHandleQty = 0
+        }
+        str +=
+            `批次【${cur.batch}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+        if( cur.handleQty > cur.balance.balanceQty){
+          console.log(2333,cur.handleQty)
+          console.log(2333,cur.balance.balanceQty)
+          str1 +=
+              `批次【${cur.batch}】提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
+        }
+      }
+    })
+  })
+  if(str1){
+    comMessageRef.value.showConfirmWarningModal(str1)
+    return
+  }
+  if (str) {
+    str = '任务明细未全部完成,是否提交?\n' + str
+    comMessageRef.value.showQuestionMessage1(str, 'red', res => {
+      if (res) {
+        submitJob()
+      }
+    });
+  } else {
+    submitJob()
+  }
+}
 const submitJob = () => {
   proxy.$modal.loading('提交中...')
 
   // 查询管理模式
-  managementList.value = []
-  const precisionStrategParams = setPrecisionStrategParams()
-  getPrecisionStrategyList(precisionStrategParams, (res) => {
-    if (res.success) {
-      managementList.value = res.list
-
-      const params = setParams()
-      inventoryMoveSubmit(params)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data) {
-            let showTitle = this.title
-            if (title.value.indexOf('任务') == title.value.length - 2) {
-              showTitle = this.title.replace('任务', '')
-            }
-            showCommitSuccessMessage(`提交成功\n生成${showTitle}库存转移记录\n${res.data}`)
-          } else {
-            showErrorMessage(`提交失败[${res.msg}]`)
+  const params = setParams()
+  inventoryMoveSubmit(params)
+      .then((res) => {
+        uni.hideLoading()
+        if (res.data) {
+          let showTitle = this.title
+          if (title.value.indexOf('任务') == title.value.length - 2) {
+            showTitle = this.title.replace('任务', '')
           }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-          showErrorMessage(error)
-        })
-    } else {
-      uni.hideLoading()
-      showErrorMessage(res.message)
-    }
-  })
+          showCommitSuccessMessage(`提交成功\n生成${showTitle}库存转移记录\n${res.data}`)
+        } else {
+          showErrorMessage(`提交失败[${res.msg}]`)
+        }
+      })
+      .catch((error) => {
+        uni.hideLoading()
+        showErrorMessage(error)
+      })
 }
 
 const setPrecisionStrategParams = () => {
diff --git a/src/pages/inventoryMove/job/inventoryMoveJob.vue b/src/pages/inventoryMove/job/inventoryMoveJob.vue
index a3e28447..7d15fd45 100644
--- a/src/pages/inventoryMove/job/inventoryMoveJob.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveJob.vue
@@ -90,7 +90,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index f212c0f4..0a734666 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -229,7 +229,7 @@ const setQueryParam = ()=>{
   if (queryParams.creationTime ) {
     filterParams.push({
       column: "create_time",
-      action: "betweeen",
+      action: "between",
       value: queryParams.creationTime
     })
   }
diff --git a/src/pages/issue/job/issueJob0816.vue b/src/pages/issue/job/issueJob0816.vue
index c8faa6b4..77141697 100644
--- a/src/pages/issue/job/issueJob0816.vue
+++ b/src/pages/issue/job/issueJob0816.vue
@@ -234,7 +234,7 @@
 				if (this.checkedToday) {
 					filters.push({
 						column: "create_time",
-						action: "betweeen",
+						action: "between",
 						value: this.todayTime
 					})
 				}
@@ -333,7 +333,7 @@
 				// if (this.checkedToday) {
 				// 	filters.push({
 				// 		column: "create_time",
-				// 		action: "betweeen",
+				// 		action: "between",
 				// 		value: this.todayTime
 				// 	})
 				// }
diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index 7625d6d3..9f3edc8c 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -137,7 +137,7 @@ const setQueryParam = ()=> {
   if (queryParams.creationTime ) {
     filterParams.push({
       column: "create_time",
-      action: "betweeen",
+      action: "between",
       value: queryParams.creationTime
     })
   }
diff --git a/src/pages/productDismantle/job/productDismantleJob.vue b/src/pages/productDismantle/job/productDismantleJob.vue
index bbd478b7..3c29c901 100644
--- a/src/pages/productDismantle/job/productDismantleJob.vue
+++ b/src/pages/productDismantle/job/productDismantleJob.vue
@@ -117,7 +117,7 @@ export default {
       if (this.checkedToday) {
         filters.push({
           column: 'create_time',
-          action: 'betweeen',
+          action: 'between',
           value: this.todayTime
         })
       }
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index 62977b0f..6bcd80d6 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -111,7 +111,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue
index 0dfec5c8..36f1265c 100644
--- a/src/pages/productReceipt/job/ccProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@@ -126,7 +126,7 @@
 		if (checkedToday.value) {
 			filters.push({
 				column: 'create_time',
-				action: 'betweeen',
+				action: 'between',
 				value: todayTime.value
 			})
 		}
diff --git a/src/pages/productReceipt/job/completeReceiveJob.vue b/src/pages/productReceipt/job/completeReceiveJob.vue
index 0dd39185..a35a570c 100644
--- a/src/pages/productReceipt/job/completeReceiveJob.vue
+++ b/src/pages/productReceipt/job/completeReceiveJob.vue
@@ -116,7 +116,7 @@ export default {
       if (this.checkedToday) {
         filters.push({
           column: 'create_time',
-          action: 'betweeen',
+          action: 'between',
           value: this.todayTime
         })
       }
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 0e34487a..0a28475f 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -101,7 +101,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'request_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue
index 0e3a4c68..fd81005d 100644
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@@ -102,7 +102,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index 859c03fc..d748d320 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -191,7 +191,7 @@ const setQueryParam = () => {
   if (queryParams.creationTime) {
     filterParams.push({
       column: "create_time",
-      action: "betweeen",
+      action: "between",
       value: queryParams.creationTime
     })
   }
diff --git a/src/pages/productionReturn/job/returnJob.vue b/src/pages/productionReturn/job/returnJob.vue
index cbe8aa7e..a8a1b62f 100644
--- a/src/pages/productionReturn/job/returnJob.vue
+++ b/src/pages/productionReturn/job/returnJob.vue
@@ -109,7 +109,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 30e25618..f522a487 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -112,7 +112,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index 920c2b7e..8c3ae647 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -104,7 +104,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 4061ef5d..f6e3241c 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -111,7 +111,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 765baf5e..1c39c134 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -144,7 +144,7 @@ const setQueryParam = ()=> {
   if (queryParams.creationTime ) {
     filterParams.push({
       column: "create_time",
-      action: "betweeen",
+      action: "between",
       value: queryParams.creationTime
     })
   }
diff --git a/src/pages/scrap/job/scrapJob.vue b/src/pages/scrap/job/scrapJob.vue
index 2bc25a59..fdc241ff 100644
--- a/src/pages/scrap/job/scrapJob.vue
+++ b/src/pages/scrap/job/scrapJob.vue
@@ -101,7 +101,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue
index 146c6a26..fd1e7116 100644
--- a/src/pages/stockUp/job/stockUpJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@@ -100,7 +100,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index 56fa69e9..f1a0d525 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -108,7 +108,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/transfer/job/issueJob.vue b/src/pages/transfer/job/issueJob.vue
index 59ac19dd..0c33ff91 100644
--- a/src/pages/transfer/job/issueJob.vue
+++ b/src/pages/transfer/job/issueJob.vue
@@ -112,7 +112,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/transfer/job/receiptJob.vue b/src/pages/transfer/job/receiptJob.vue
index 0207e3e8..6ef9c64e 100644
--- a/src/pages/transfer/job/receiptJob.vue
+++ b/src/pages/transfer/job/receiptJob.vue
@@ -102,7 +102,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue
index d5acbe6c..82908b10 100644
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@@ -105,7 +105,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue
index 7d2fd61e..23a7b873 100644
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@@ -112,7 +112,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }