From d0cd063493081481ab9833bf25f0ec89eab056e1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 10 Sep 2024 10:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E8=BF=9B=E5=85=88?=
 =?UTF-8?q?=E5=87=BA=E5=8F=91=E6=96=99=E5=8A=9F=E8=83=BD2024/7/29=2013:55:?=
 =?UTF-8?q?39?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |   5 +-
 src/pages.json                                |   2 +-
 src/pages/issue/record/issueRecord.vue        | 987 ++++++++++++------
 src/pages/issue/record/issueRecordV1.vue      | 349 +++++++
 .../repleinsh/record/repleinshRecord.vue      |   2 +-
 .../repleinsh/record/repleinshRecordV1.vue    | 465 +++++++++
 6 files changed, 1510 insertions(+), 300 deletions(-)
 create mode 100644 src/pages/issue/record/issueRecordV1.vue
 create mode 100644 src/pages/repleinsh/record/repleinshRecordV1.vue

diff --git a/src/api/request2.js b/src/api/request2.js
index 04766268..72bf5624 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -864,7 +864,7 @@ export function getIssueJobDetail(id) {
  * /wms/issue-request-main
  */
 export function getBalanceByBatchOffShelf(itemCode, qty) {
-  return http.get("/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&&qty=" + qty)
+  return http.get("/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&qty=" + qty + "&businesstype=" + businesstype)
 }
 
 /**
@@ -2649,7 +2649,8 @@ export  function getBusinessType() {
  */
 
 export  function getPlaneInfoByproductLine(productionLine,planDate) {
-	return http.get("/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate)
+	return http.get("/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine=" +
+			productionLine + "&planDate=" + planDate)
 }
 
 /**
diff --git a/src/pages.json b/src/pages.json
index f4d53c48..d5476a87 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -597,7 +597,7 @@
 		{
 			"path": "pages/issue/record/issueRecord",
 			"style": {
-				"navigationBarTitleText": "直接发料记录",
+				"navigationBarTitleText": "先进先出发料",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					"autoBackButton": "true"
diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue
index 96b42863..474e5a29 100644
--- a/src/pages/issue/record/issueRecord.vue
+++ b/src/pages/issue/record/issueRecord.vue
@@ -1,349 +1,744 @@
 <template>
   <view class="page-wraper">
-    <view class="" v-if="detailSource.length == 0">
-      <com-blank-view @goScan="goScan(true)"></com-blank-view>
+    <view class="">
+      <com-blank-view @goScan="showFromLocationPopup" v-if="recommendList.length == 0"></com-blank-view>
     </view>
-    <view v-else class="page-wraper">
+    <view class="page-wraper" v-if="recommendList.length > 0">
+      <!-- <view class="page-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class='split_line'></view>
+			</view> -->
+
+      <view class="page-header">
+        <view class="header_item" style="font-size: 35rpx; padding: 10rpx">
+          <uni-collapse ref="collapse">
+            <uni-collapse-item :open="true">
+              <template v-slot:title>
+                <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 先进先出推荐信息 </view>
+              </template>
+              <view class="detail-list" v-for="(recommend, index) in recommendList" :key="recommend.id">
+                <view class="card_view">
+                  <text class="card_item_code">物料代码</text>
+                  <text class="card_content">{{ recommend.itemCode }}</text>
+                </view>
+                <balance :dataContent="recommend" :isShowStatus="false"></balance>
+              </view>
+            </uni-collapse-item>
+          </uni-collapse>
+        </view>
+      </view>
+
       <view class="page-main">
-        <scroll-view scroll-y="true" class="">
-          <view v-for="(toLocation, index) in detailSource">
-            <view class="uni-row uni-flex">
-              <!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
-							</com-issue-request-info> -->
-              <work-station :workshopCode="workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"></work-station>
+        <scroll-view scroll-y="true" class="page-main-scroll">
+          <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+            <view class="">
+              <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" :isShowFromLocation="false" @removeItem="removeItem(index, item)" :isShowToLocation="false" @updateData="updateData" @removePack="removePack"> </record-com-detail-card>
             </view>
-            <com-issue-detail-card ref="comIssueDetailCardRef" :dataContent="toLocation" @updateData="updateData" @removeItemCode="removeItemCode"> </com-issue-detail-card>
           </view>
         </scroll-view>
-        <button class="btn_add" @click="goScan(false)">+去添加</button>
       </view>
-
       <view class="page-footer">
         <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
-          <view class=""> </view>
+          <view class="uni-row uni-flex">
+            <text>生产线:</text>
+            <view class="uni-flex u-col-center uni-row" @click="showSelect">
+              <view class="" style="margin-left: 20rpx">
+                {{ positionInfo }}
+              </view>
+              <u-select v-model="show" mode="mutil-column-auto" :list="positionList" @confirm="confirmSelect"></u-select>
+            </view>
+          </view>
           <view class="uni-flex uni-row">
-            <button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+            <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
           </view>
         </view>
       </view>
+      <win-scan-button @goScan="openScanPopup"></win-scan-button>
     </view>
+    <win-scan-pack-and-location ref="scanPopup" @getResult="onScan" :allowModifyLocation="false" :queryBalance="false"> </win-scan-pack-and-location>
+    <comMessage ref="comMessage"></comMessage>
+    <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <balance-select ref="balanceSelect" @onSelectItem="selectBalanceItem"></balance-select>
   </view>
-  <com-issue-request-popup ref="comIssueRequestPopupRef" @confirm="requestConfirm" :itemCodeTypeList="itemCodeTypeList"></com-issue-request-popup>
-  <win-scan-button v-if="detailSource.length > 0" @goScan="openScanDetailPopup"></win-scan-button>
-  <com-scan-issue-pack ref="comScanIssuePackRef" @closeScan="closeScan" @updateData="updateData"> </com-scan-issue-pack>
-  <com-message ref="comMessageRef" />
 </template>
 
-<script setup lang="ts">
-import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-import { issueRecordSubmit, getBalanceByBatchOffShelf } from '@/api/request2.js'
+<script>
+import { issueRecordSubmit, getWorkShopLineStation, getBalanceByFilter, getBalanceByBatchOffShelf } from '@/api/request2.js'
 
-import { goHome, getRemoveOption, getISODateTime, getCurrDateTime, getPackingNumberAndBatch } from '@/common/basic.js'
+import { goHome, getPackingNumberAndBatchByList, deepCopyData } from '@/common/basic.js'
 
-import { getDataSource } from '@/pages/issue/js/issue.js'
-import { getBusinessType } from '@/common/record.js'
 import { calc } from '@/common/calc.js'
 
-import { getManagementPrecisions } from '@/common/balance.js'
+import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js'
+
+import { getBusinessType, createItemInfo, createDetailInfo, calcTreeHandleQty, calcHandleQty } from '@/common/record.js'
+
+import { getManagementPrecisions, getPrecisionStrategyList, getPrecisionStrategyParams } from '@/common/balance.js'
 
-import comBlankView from '@/mycomponents/common/comBlankView.vue'
-import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
-import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
-import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
-import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
-import workStation from '@/mycomponents/workStation/workStation.vue'
-
-import { useCountStore } from '@/store'
-// 获取自定义的store
-const store = useCountStore()
-const { proxy } = getCurrentInstance()
-const subList = ref([]) // 接口返回的任务subList
-const dataContent = ref({})
-const detailSource = ref([]) // 绑定在页面上的数据源
-const detailOptions = ref([])
-const scanOptions = ref([])
-const workShopCode = ref('')
-const fromInventoryStatuses = ref('')
-const toInventoryStatuses = ref('')
-const requestList = ref([])
-const managementList = ref([])
-const itemCodeTypeList = ref([])
-const comIssueDetailCardRef = ref()
-const comIssueRequestPopupRef = ref()
-const comScanIssuePackRef = ref()
-onNavigationBarButtonTap((e) => {
-  if (e.index === 0) {
-    goHome()
-  }
-})
-onLoad((option) => {
-  const typeCode = 'Issue'
-  getBusinessType(typeCode, (res) => {
-    if (res.success) {
-      businessType.value = res.businessType
-      itemCodeTypeList.value = res.itemCodeTypeList
-      fromInventoryStatuses.value = res.fromInventoryStatuses
-      toInventoryStatuses.value = res.toInventoryStatuses
-      goScan(true)
-    } else {
-      showErrorMessage(res.message)
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
+import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+import balance from '@/mycomponents/balance/balance.vue'
+
+export default {
+  components: {
+    winScanButton,
+    winScanPack,
+    requiredLocation,
+    comBlankView,
+    winScanLocation,
+    winScanPackAndLocation,
+    recordComDetailCard,
+    recordDetailCard,
+    balanceSelect,
+    balance
+  },
+  data() {
+    return {
+      id: '',
+      dataContent: {}, // 内容
+      detailSource: [], // 绑定在页面上的数据源
+      fromLocationInfo: {},
+      fromLocationCode: '',
+      fromLocationAreaTypeList: [],
+      toLocationAreaTypeList: [],
+      inInventoryStatus: '', // 目标入库库存状态
+      outInventoryStatus: '', // 来源出库库存状态
+      businessType: {},
+      showToLoaction: true,
+      recommendLocationList: [], // 推荐库位列表
+      fromWarehouseCode: '', // 来源仓库
+      businessTypeCode: 'Issue',
+      positionList: [],
+      show: false,
+      positionInfo: '请选择生产线',
+      resultData: {},
+      recommendList: []
     }
-  })
-})
-const closeScan = () => {
-  resizeCollapse()
-}
-const resizeCollapse = () => {
-  nextTick((r) => {
-    comIssueDetailCardRef.value.forEach((r) => {
-      r.resizeCollapse()
+  },
+  onLoad(option) {
+    uni.setNavigationBarTitle({
+      title: option.title
+    })
+    this.clearData()
+    getBusinessType(this.businessTypeCode, (res) => {
+      if (res.success) {
+        this.businessType = res.businessType
+        this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
+        this.toLocationAreaTypeList = res.toLocationAreaTypeList
+        this.showFromLocationPopup()
+      } else {
+        this.showErrorMessage(res.message)
+      }
     })
-  })
-}
-const goScan = (editPosition) => {
-  comIssueRequestPopupRef.value.openRequestPopup(editPosition)
-}
 
-// 确定需求信息
-
-const requestConfirm = (action, item) => {
-  if (item.itemCode == '' || item.itemCode == null) return
-
-  const request = requestList.value.find((r) => r.itemCode == item.itemCode)
-  if (request == undefined) {
-    requestList.value.push(item)
-    getRecommendInfo(item)
-  } else {
-    comMessageRef.value.showQuestionMessage(`已经存在物料[${item.itemCode}]的需求信息,是否要修改?`, (res) => {
-      if (res) {
-        request.qty = item.qty
-        detailSource.value.forEach((detail) => {
-          const index = detail.Items.findIndex((r) => {
-            r.itemCode == item.itemCode
-          })
-          detail.Items.splice(index, 1)
+    // if (this.positionList.length == 0) {
+    getWorkShopLineStation()
+      .then((res) => {
+        if (res.data != null && res.data.length > 0) {
+          this.positionList = res.data
+        } else {
+          this.showErrorMessage('未查找到位置信息')
+        }
+      })
+      .catch((error) => {
+        this.showErrorMessage(error)
+      })
+    // }
+  },
+  // 返回首页
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      goHome()
+    }
+  },
+  // 拦截返回按钮事件
+  onBackPress(e) {},
+
+  onPullDownRefresh() {},
+
+  mounted() {},
+
+  methods: {
+    getBalance(label, packageInfo, callback) {
+      const filters = []
+
+      if (packageInfo.parentNumber) {
+        const packingNumber = `${packageInfo.parentNumber},${label.packingNumber}`
+        filters.push({
+          column: 'packingNumber',
+          action: 'in',
+          value: packingNumber
+        })
+      } else {
+        filters.push({
+          column: 'packingNumber',
+          action: '==',
+          value: label.packingNumber
         })
-        getRecommendInfo(item)
       }
-    })
-  }
-}
 
-const getRecommendInfo = (item) => {
-  proxy.$modal.loading('加载中....')
-  getBalanceByBatchOffShelf(item.itemCode, item.qty)
-    .then((res) => {
-      if (res.data == null) {
-        showMessage('未获取到推荐信息')
+      filters.push({
+        column: 'itemCode',
+        action: '==',
+        value: label.itemCode
+      })
+      filters.push({
+        column: 'batch',
+        action: '==',
+        value: label.batch
+      })
+
+      if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != '') {
+        filters.push({
+          column: 'inventoryStatus',
+          action: 'in',
+          value: this.fromInventoryStatuses
+        })
+      }
+
+      const params = {
+        filters,
+        pageNo: 1,
+        pageSize: 100
+      }
+      getBalanceByFilter(params)
+        .then((res) => {
+          callback(res.data)
+        })
+        .catch((err) => {
+          this.showErrorMessage(err.message)
+        })
+    },
+
+    getScanResult(result) {
+      this.resultData = result
+      const packageInfo = result.package
+      this.getBalance(result.label, packageInfo, (balances) => {
+        // 扫描的是外包装
+        const s = ''
+        if (!result.package.parentNumber) {
+          if (balances.list.length == 0) {
+            this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+          } else {
+            const newBalances = balances.list.filter((b) => b.locationCode == this.fromLocationCode)
+            if (newBalances.length == 0) {
+              this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+            } else if (newBalances.length == 1) {
+              const balance = newBalances[0]
+              result.balance = balance
+              this.afterGetBalance(result)
+            } else {
+              this.showBalanceSelect(newBalances)
+            }
+          }
+        } else {
+          // 扫描的是小包装
+          if (balances.list.length == 0) {
+            this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+          } else {
+            // 小包装库存
+            const subPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.number)
+            // 外包装库存
+            const subParentPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.parentNumber && r.locationCode == this.fromLocationCode)
+
+            // 小包装没有库存，
+            if (subPackitems.length == 0) {
+              // 外包装有库存，出库后剩余库存未转换为出库包装规格
+
+              if (subParentPackitems.length > 0) {
+                if (subParentPackitems.length == 1) {
+                  const balance = subParentPackitems[0]
+                  balance.qty = packageInfo.qty
+                  result.balance = balance
+                  this.afterGetBalance(result)
+                } else {
+                  this.showBalanceSelect(subParentPackitems)
+                }
+              } else {
+                this.showErrorMessage(`按外包装【${packageInfo.parentNumber}】和子包装【${packageInfo.number}】都未查找到库存余额`)
+              }
+            } else {
+              let locationCode = this.fromLocationCode
+              if (balances.list == 1) {
+                locationCode = balances.list[0].locationCode
+              } else {
+                const manyBlances = balances.list.filter((r) => r.locationCode != this.fromLocationCode)
+                if (manyBlances.length > 0) {
+                  locationCode = manyBlances[0].locationCode
+                }
+              }
+              this.showErrorMessage(`该包装【${packageInfo.number}】在库位【${locationCode}】已经有库存余额,请重新扫描`)
+            }
+          }
+        }
+      })
+    },
+
+    onScan(result) {
+      const that = this
+      const pack = result.package
+      if (that.recommendList.length > 0) {
+        const recommend = that.recommendList.filter((r) => r.itemCode == pack.itemCode)
+        if (recommend.length == 0) {
+          this.showErrorMessage(`物料代码【${pack.itemCode}】不在推荐列表中`)
+        } else {
+          const batch = recommend.find((r) => r.batch == pack.batch)
+          if (batch == undefined) {
+            that.showErrorMessage(`扫描的批次【${pack.batch}】,不是系统推荐的批次,不满足系统的先进先出规则,请重新扫描物料`)
+          } else {
+            this.getScanResult(result)
+          }
+        }
       } else {
-        if (res.data.length > 0) {
-          workShopCode.value = item.workshopCode
-          res.data.forEach((r) => {
-            r.toLocationCode = item.rawLocationCode
-            r.productionLineCode = item.productionLineCode
-            r.workStationCode = item.workStationCode
-            // r.itemCode = item.itemCode;
-            r.itemName = item.itemName
-            r.uom = item.uom
-            subList.value.push(r)
-          })
-          detailSource.value = getDataSource(detailSource.value, subList.value)
-          // 要修改一下数量
-          detailSource.value.forEach((detail) => {
-            detail.Items.forEach((i) => {
-              const request = requestList.value.find((r) => r.itemCode == i.itemCode)
-              i.qty = request.qty
+        this.getRecommendInfo(result)
+      }
+    },
+
+    getRecommendInfo(result) {
+      const that = this
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
+      const item = {
+        itemCode: result.package.itemCode,
+        qty: result.package.qty
+      }
+      getBalanceByBatchOffShelf(item.itemCode, item.qty, 'issue')
+        .then((res) => {
+          if (res.data == null) {
+            that.showErrorMessage('未获取到推荐信息')
+          } else {
+            if (res.data.length > 0) {
+              that.recommendList = res.data
+              that.recommendList.forEach((r) => (r.locationCode = r.fromLocationCode))
+              const recommendInfo = res.data[0]
+              if (recommendInfo.batch != result.package.batch) {
+                that.showErrorMessage(`扫描的批次【${result.package.batch}】,不是系统推荐的批次【${recommendInfo.batch}】,不满足系统的先进先出规则,请重新扫描`)
+              } else {
+                this.getScanResult(result)
+              }
+            } else {
+              that.showErrorMessage('未查找到物料的推荐信息')
+            }
+            uni.hideLoading()
+          }
+        })
+        .catch((error) => {
+          uni.hideLoading()
+          that.showErrorMessage(error)
+        })
+    },
+
+    showBalanceSelect(items) {
+      this.$refs.balanceSelect.openPopup(items)
+    },
+
+    selectBalanceItem(balance) {
+      this.resultData.balance = balance
+      this.afterGetBalance(this.resultData)
+    },
+
+    afterGetBalance(result) {
+      const { balance } = result
+      const { label } = result
+      const pack = result.package
+      const { packUnit } = pack
+      const { packQty } = pack
+      const item = this.detailSource.find((res) => {
+        if (res.itemCode == balance.itemCode) {
+          return res
+        }
+      })
+      if (this.fromWarehouseCode == '') {
+        this.fromWarehouseCode = balance.warehouseCode
+      }
+      if (item == undefined) {
+        const itemp = createItemInfo(balance, pack)
+        const newDetail = createDetailInfo(balance, pack) //
+        newDetail.parentNumber = pack.parentNumber
+        newDetail.packingNumber = pack.number
+        newDetail.packUnit = packUnit
+        newDetail.packQty = packQty
+        itemp.subList.push(newDetail)
+        this.detailSource.push(itemp)
+        calcHandleQty(this.detailSource)
+      } else {
+        const detail = item.subList.find((r) => {
+          if (r.packingNumber == pack.number && r.batch == balance.batch && r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
+            return r
+          }
+        })
+        if (detail == undefined) {
+          const newDetail = createDetailInfo(balance, pack)
+          newDetail.parentNumber = pack.parentNumber
+          newDetail.packingNumber = pack.number
+          newDetail.packUnit = packUnit
+          newDetail.packQty = packQty
+          item.subList.push(newDetail)
+          calcHandleQty(this.detailSource)
+        } else if (detail.scaned == true) {
+          this.showErrorMessage(`箱码[${detail.packingNumber}]批次[${balance.batch}]已经在列表中`)
+        }
+      }
+    },
+
+    getScanResult1(result) {
+      const { balance } = result
+      const { label } = result
+      const pack = result.package
+      const { packUnit } = pack
+      const { packQty } = pack
+      const item = this.detailSource.find((res) => {
+        if (res.itemCode == balance.itemCode) {
+          return res
+        }
+      })
+      if (this.fromWarehouseCode == '') {
+        this.fromWarehouseCode = balance.warehouseCode
+      }
+      if (item == undefined) {
+        const itemp = createItemInfo(balance, pack)
+        const newDetail = createDetailInfo(balance, pack) //
+        newDetail.packUnit = packUnit
+        newDetail.packQty = packQty
+        itemp.subList.push(newDetail)
+        this.detailSource.push(itemp)
+        calcHandleQty(this.detailSource)
+      } else {
+        const detail = item.subList.find((r) => {
+          if (r.packingNumber == balance.packingNumber && r.batch == balance.batch && r.locationCode == balance.locationCode && r.inventoryStatus == balance.inventoryStatus) {
+            return r
+          }
+        })
+        if (detail == undefined) {
+          const newDetail = createDetailInfo(balance, pack)
+          newDetail.packUnit = packUnit
+          newDetail.packQty = packQty
+          item.subList.push(newDetail)
+          calcHandleQty(this.detailSource)
+        } else if (detail.scaned == true) {
+          this.showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
+        }
+      }
+    },
+
+    // 获取推荐库位
+    getRecommendLocation(balance, pack, callback) {
+      uni.showLoading({
+        title: '扫描中...',
+        mask: true
+      })
+      const recommend = this.recommendLocationList.find((r) => r.itemCode == balance.itemCode)
+      if (recommend == undefined) {
+        const param = {
+          itemCode: balance.itemCode,
+          batch: balance.batch,
+          inventoryStatus: balance.inventoryStatus,
+          supplierCode: pack.supplierCode,
+          businessCode: this.businessTypeCode
+        }
+        console.log(JSON.stringify(param))
+        getPutawayRecommendLocation(param)
+          .then((res) => {
+            this.recommendLocationList.push({
+              itemCode: balance.itemCode,
+              locationCode: res.data.code
             })
+            callback(res.data)
+            uni.hideLoading()
           })
-          resizeCollapse()
-        } else {
-          showMessage('列表数据为0')
+          .catch((error) => {
+            uni.hideLoading()
+            this.showErrorMessage(error)
+            uni.hideLoading()
+          })
+      } else {
+        callback(recommend)
+      }
+    },
+
+    showErrorMessage(message) {
+      this.$refs.comMessage.showErrorMessage(message, (res) => {
+        if (res) {
+        }
+      })
+    },
+
+    calcTreeHandleQty() {
+      for (const item of this.detailSource) {
+        item.qty = 0
+        for (const detail of item.subList) {
+          if (detail != undefined) {
+            item.qty = calc.add(item.qty, detail.qty)
+          }
         }
-        uni.hideLoading()
       }
-    })
-    .catch((error) => {
-      uni.hideLoading()
-      showErrorMessage(error)
-    })
-}
+      this.$forceUpdate()
+    },
 
-const caclcQty = () => {
-  let totalQty = 0
-  detailSource.value.subList.forEach((res) => {
-    totalQty = calc.add(totalQty, res.qty)
-  })
-  detailSource.value.totalQty = totalQty
-}
-constopenScanDetailPopup = () => {
-  const datacontent = {}
-  // 克隆对象，深度克隆，防止双向绑定同一个变量
-  // Object.assign(datacontent, this.detailSource);
-  const dataContent = {
-    allowModifyPackingNumber: 'FALSE',
-    outInventoryStatuses: fromInventoryStatuses.value
-  }
-  comScanIssuePackRef.value.openScanPopup(detailSource.value, dataContent)
-}
+    showSelect() {
+      // if (this.editPosition) {
+      this.show = true
+      // }
+    },
 
-const closeScanPopup = () => {
-  updateCommitBtn()
-}
+    confirmSelect(e) {
+      this.positionInfo = `${e[0].label}-${e[1].label}-${e[2].label}`
+      console.log('位置', this.positionInfo)
+      this.workshopCode = e[0].value
+      this.productionLineCode = e[1].value
+      this.workStationCode = e[2].value
+      this.workShopName = e[0].label
+      this.productionLineName = e[1].label
+      this.workStationName = e[2].label
+
+      const shop = this.positionList.find((shop) => shop.value == this.workshopCode)
+      if (shop != undefined && shop.children != undefined) {
+        const prodLine = shop.children.find((line) => line.value == this.productionLineCode)
+        if (prodLine != undefined && prodLine.children != undefined) {
+          const station = prodLine.children.find((r) => r.value == this.workStationCode)
+          if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+            this.showErrorMessage(`${this.workStationName}的原材料库位为空,请重新选择`)
+            return
+          }
+          this.rawLocationCode = station.rawLocationCode
+          this.fgLocationCode = station.fgLocationCode
+        } else {
+          this.showErrorMessage('生产线-工位基础信息维护错误')
+        }
+      } else {
+        this.showErrorMessage('车间-生产线基础信息维护错误')
+      }
 
-constupdateData = (record) => {
-  const requestLocation = detailSource.value.find((r) => r.toLocationCode == record.toLocationCode)
-  const item = requestLocation.Items.find((r) => r.itemCode == record.itemCode)
-  let itemHandleQty = 0
-  if (item != undefined) {
-    item.Locations.forEach((l) => {
-      const batch = l.Batchs.find((b) => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch)
-      let handleQty = 0
-      if (batch != undefined) {
-        batch.Records.forEach((res) => {
-          handleQty = calc.add(handleQty, res.qty)
+      // 赋值到库位代码
+      let toLocationCode = ''
+      this.positionList.forEach((item) => {
+        if (this.workshopCode == item.value) {
+          // 车间
+          item.children.find((child) => {
+            if (this.productionLineCode == child.value) {
+              toLocationCode = child.children.find((subChild) => this.workStationCode == subChild.value).rawLocationCode
+            }
+          })
+        }
+      })
+      this.detailSource.forEach((item) => {
+        item.subList.forEach((detail) => {
+          detail.toLocationCode = toLocationCode
         })
-        batch.handleQty = handleQty
-        itemHandleQty = calc.add(itemHandleQty, handleQty)
+      })
+    },
+
+    removeItem(index, item) {
+      this.detailSource.splice(index, 1)
+    },
+
+    removePack() {
+      for (let i = 0; i < this.detailSource.length; i++) {
+        const item = this.detailSource[i]
+        if (item.subList.length == 0) {
+          this.detailSource.splice(i, 1)
+        }
       }
-    })
-  }
-  resizeCollapse()
-  // item.handleQty=itemHandleQty;
-  // this.closeScan();
-}
-const removeItemCode = () => {
-  const isClear = detailSource.value[0].Items.length == 0
-  if (isClear) {
-    clearData()
-    comIssueRequestPopupRef.value.initData()
-  }
-}
-const setParams = () => {
-  const subList = []
-  const createTime = getCurrDateTime()
-  const creator = store.id
-  detailSource.value.forEach((toLocationCode) => {
-    toLocationCode.Items.forEach((item) => {
-      item.Locations.forEach((fromLocation) => {
-        fromLocation.Batchs.forEach((batch) => {
-          const subItem = batch.detail
-          subItem.recordList = []
-          if (batch.Records.length > 0) {
-            batch.Records.forEach((r) => {
-              const record = {}
-              record.handleQty = r.qty
-
-              record.fromPackingNumber = r.packingNumber
-              record.fromBatch = r.batch
-              record.fromContainerNumber = r.ContainerNumber
-
-              record.toContainerNumber = r.ContainerNumber
-              record.toInventoryStatus = r.inventoryStatus
-              record.toLocationCode = subItem.toLocationCode
-              record.fromLocationCode = fromLocation.fromLocationCode
-              record.supplierCode = r.supplierCode
-
-              const single_price = r.singlePrice == null ? 0 : r.singlePrice
-
-              record.singlePrice = single_price
-              record.amount = single_price * r.qty
-
-              // 使用在途库不改变管理模式
-              const info = getPackingNumberAndBatch(managementList.value, r.itemCode, r.packingNumber, r.batch)
-              record.toPackingNumber = info.packingNumber
-              record.toBatch = info.batch
-              subItem.recordList.push(record)
+      this.updateData()
+    },
+
+    openScanPopup() {
+      if (this.fromLocationCode == '') {
+        this.showFromLocationPopup()
+        return
+      }
+      this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType)
+    },
+
+    showFromLocationPopup() {
+      this.$nextTick(() => {
+        this.$refs.scanLocationCode.openScanPopup()
+      })
+    },
+
+    closeScanPopup() {
+      if (this.$refs.scanPopup != undefined) {
+        this.$refs.scanPopup.closeScanPopup()
+      }
+    },
+
+    scanPopupGetFocus() {
+      if (this.$refs.scanPopup != undefined) {
+        this.$refs.scanPopup.getfocus()
+      }
+    },
+
+    // scanLocationCode(location, code) {
+    // 	this.toLocationCode = code
+    // 	this.toLocationCode = location;
+
+    // },
+
+    commit() {
+      uni.showLoading({
+        title: '提交中....',
+        mask: true
+      })
+
+      // 记录有目标库位，需要查询管理模式
+      const precisionStrategyParams = getPrecisionStrategyParams(this.detailSource)
+      // 2:获取管理模式，封装参数
+      getPrecisionStrategyList(precisionStrategyParams, (res) => {
+        if (res.success) {
+          this.managementList = res.list
+          const params = {
+            ...this.setRecordParams()
+          }
+          console.log('提交参数', JSON.stringify(params))
+
+          issueRecordSubmit(params)
+            .then((res) => {
+              uni.hideLoading()
+              if (res.data) {
+                this.showCommitSuccessMessage(`提交成功<br>生成直接发料记录<br>${res.data}`)
+              } else {
+                this.showErrorMessage(`提交失败[${res.msg}]`)
+              }
             })
-            subList.push(subItem)
+            .catch((error) => {
+              uni.hideLoading()
+              this.showErrorMessage(error)
+            })
+        } else {
+          uni.hideLoading()
+          this.showErrorMessage(res.message)
+        }
+      })
+    },
+
+    setRecordParams() {
+      const subList = []
+      const creator = this.$store.state.user.id
+      this.detailSource.forEach((item) => {
+        item.subList.forEach((detail) => {
+          if (detail.scaned) {
+            const info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch)
+            const submitItem = deepCopyData(detail)
+            submitItem.toPackingNumber = info.packingNumber
+            submitItem.toBatch = info.batch
+            submitItem.toContainerNumber = detail.containerNumber
+
+            submitItem.fromPackingNumber = info.packingNumber
+            submitItem.fromBatch = info.batch
+            submitItem.fromContainerNumber = detail.containerNumber
+
+            submitItem.fromLocationCode = detail.locationCode
+            submitItem.toLocationCode = detail.toLocationCode
+
+            // detail.toInventoryStatus = detail.inventoryStatus
+            // detail.toLocationCode = detail.toLocationCode
+            submitItem.qty = detail.handleQty
+            submitItem.package = ''
+            submitItem.recordList = [
+              {
+                toInventoryStatus: detail.inventoryStatus,
+                fromParentPackingNumber: detail.parentNumber,
+                fromPackingNumber: info.packingNumber,
+                fromBatch: info.batch,
+                toPackingNumber: info.packingNumber,
+                toBatch: info.batch,
+                fromLocationCode: detail.locationCode,
+                toLocationCode: detail.toLocationCode,
+                handleQty: detail.handleQty,
+                fromPackUnit: detail.packUnit,
+                toPackUnit: detail.packUnit,
+                fromPackQty: detail.packQty,
+                toPackQty: detail.packQty
+              }
+            ]
+            subList.push(submitItem)
           }
         })
       })
-    })
-  })
+      if (subList.length > 0) {
+        this.dataContent.toWarehouseCode = subList[0].toWarehouseCode
+      }
+      this.dataContent.subList = subList
+      this.dataContent.creator = creator
+      this.dataContent.fromWarehouseCode = this.fromWarehouseCode
+      return this.dataContent
+    },
 
-  dataContent.value.subList = subList
-  dataContent.value.createTime = createTime
-  dataContent.value.creator = creator
-  return dataContent.value
-}
-const submit = () => {
-  proxy.$modal.loading('提交中....')
-
-  // 目前任务只到一个库位
-  const itemCodes = []
-  const locationCode = detailSource.value[0].toLocationCode
-  detailSource.value.forEach((toLocation) => {
-    toLocation.Items.forEach((item) => {
-      itemCodes.push(item.itemCode)
-    })
-  })
-
-  // 获取管理模式，封装参数
-  getManagementPrecisions(itemCodes, locationCode, (res) => {
-    if (res.success) {
-      managementList.value = res.list
-      submitJob()
-    } else {
-      uni.hideLoading()
-      showErrorMessage(res.message)
-    }
-  })
-}
+    showMessage(message) {
+      this.$refs.comMessage.showMessage(message, (res) => {
+        if (res) {
+        }
+      })
+    },
 
-const submitJob = () => {
-  const params = setParams()
-  console.log('提交参数', JSON.stringify(params))
-  issueRecordSubmit(params)
-    .then((res) => {
-      uni.hideLoading()
-      if (res.data) {
-        showCommitSuccessMessage(`提交成功<br>生成发料记录<br>${res.data}`)
-      } else {
-        showErrorMessage(`提交失败:【${res.msg}】`)
+    showScanMessage(message) {
+      this.$refs.comMessage.showScanMessage(message)
+    },
+
+    afterCloseMessage() {
+      this.scanPopupGetFocus()
+    },
+
+    closeScanMessage() {
+      this.scanPopupGetFocus()
+    },
+    getLocation(location, code) {
+      this.getFromLocationCode(location, code)
+    },
+    getFromLocationCode(location, code) {
+      this.fromLocationInfo = location
+      this.fromLocationCode = code
+      this.openScanPopup()
+    },
+    getToLocationCode(location, code) {
+      if (this.fromLocationCode == code) {
+        uni.showToast({
+          title: `来源库位[${this.fromLocationCode}]不能与目标库位[${code}]一致`,
+          duration: 2000
+        })
+        return
       }
-    })
-    .catch((error) => {
-      uni.hideLoading()
-      showErrorMessage(error)
-    })
-}
+      this.toLocationCode = code
+    },
 
-const showCommitSuccessMessage = (hint) => {
-  comMessageRef.value.showSuccessMessage(hint, (res) => {
-    if (res) {
-      clearData()
-      comIssueRequestPopup.value.initData()
-    }
-  })
-}
+    showCommitSuccessMessage(hint) {
+      this.$refs.comMessage.showSuccessMessage(hint, (res) => {
+        this.clearData()
+      })
+    },
 
-const clearData = () => {
-  subList.value = [] // 接口返回的任务subList
-  detailSource.value = [] // 绑定在页面上的数据源
-  detailOptions.value = []
-  scanOptions.value = []
-  workShopCode.value = ''
-  requestList.value = []
-  dataContent.value = {}
-  managementList.value = []
-}
-const showMessage = (message) => {
-  comMessageRef.value.showMessage(message, (res) => {
-    if (res) {
-      afterCloseMessage()
-    }
-  })
-}
-const showErrorMessage = (message) => {
-  comMessageRef.value.showErrorMessage(message, (res) => {
-    if (res) {
+    updateData() {
+      calcHandleQty(this.detailSource)
+      for (let i = 0; i < this.detailSource.length; i++) {
+        const item = this.detailSource[i]
+        if (item.qty == 0) {
+          this.detailSource.splice(i, 1)
+        }
+      }
+      this.$forceUpdate()
+    },
+
+    clearData() {
+      this.fromLocationInfo = {}
+      this.fromLocationCode = ''
+      this.fromWarehouseCode = ''
+      this.toWarehouseCode = ''
+      this.detailSource = []
+      this.positionInfo = '请选择生产线'
     }
-  })
+  }
 }
 </script>
 
-<style></style>
+<style scoped lang="scss"></style>
diff --git a/src/pages/issue/record/issueRecordV1.vue b/src/pages/issue/record/issueRecordV1.vue
new file mode 100644
index 00000000..96b42863
--- /dev/null
+++ b/src/pages/issue/record/issueRecordV1.vue
@@ -0,0 +1,349 @@
+<template>
+  <view class="page-wraper">
+    <view class="" v-if="detailSource.length == 0">
+      <com-blank-view @goScan="goScan(true)"></com-blank-view>
+    </view>
+    <view v-else class="page-wraper">
+      <view class="page-main">
+        <scroll-view scroll-y="true" class="">
+          <view v-for="(toLocation, index) in detailSource">
+            <view class="uni-row uni-flex">
+              <!-- 	<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
+							</com-issue-request-info> -->
+              <work-station :workshopCode="workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"></work-station>
+            </view>
+            <com-issue-detail-card ref="comIssueDetailCardRef" :dataContent="toLocation" @updateData="updateData" @removeItemCode="removeItemCode"> </com-issue-detail-card>
+          </view>
+        </scroll-view>
+        <button class="btn_add" @click="goScan(false)">+去添加</button>
+      </view>
+
+      <view class="page-footer">
+        <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
+          <view class=""> </view>
+          <view class="uni-flex uni-row">
+            <button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <com-issue-request-popup ref="comIssueRequestPopupRef" @confirm="requestConfirm" :itemCodeTypeList="itemCodeTypeList"></com-issue-request-popup>
+  <win-scan-button v-if="detailSource.length > 0" @goScan="openScanDetailPopup"></win-scan-button>
+  <com-scan-issue-pack ref="comScanIssuePackRef" @closeScan="closeScan" @updateData="updateData"> </com-scan-issue-pack>
+  <com-message ref="comMessageRef" />
+</template>
+
+<script setup lang="ts">
+import { ref, getCurrentInstance, nextTick } from 'vue'
+import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { issueRecordSubmit, getBalanceByBatchOffShelf } from '@/api/request2.js'
+
+import { goHome, getRemoveOption, getISODateTime, getCurrDateTime, getPackingNumberAndBatch } from '@/common/basic.js'
+
+import { getDataSource } from '@/pages/issue/js/issue.js'
+import { getBusinessType } from '@/common/record.js'
+import { calc } from '@/common/calc.js'
+
+import { getManagementPrecisions } from '@/common/balance.js'
+
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+import comIssueRequestCreator from '@/pages/issue/coms/comIssueRequestCreator.vue'
+import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
+import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+import workStation from '@/mycomponents/workStation/workStation.vue'
+
+import { useCountStore } from '@/store'
+// 获取自定义的store
+const store = useCountStore()
+const { proxy } = getCurrentInstance()
+const subList = ref([]) // 接口返回的任务subList
+const dataContent = ref({})
+const detailSource = ref([]) // 绑定在页面上的数据源
+const detailOptions = ref([])
+const scanOptions = ref([])
+const workShopCode = ref('')
+const fromInventoryStatuses = ref('')
+const toInventoryStatuses = ref('')
+const requestList = ref([])
+const managementList = ref([])
+const itemCodeTypeList = ref([])
+const comIssueDetailCardRef = ref()
+const comIssueRequestPopupRef = ref()
+const comScanIssuePackRef = ref()
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome()
+  }
+})
+onLoad((option) => {
+  const typeCode = 'Issue'
+  getBusinessType(typeCode, (res) => {
+    if (res.success) {
+      businessType.value = res.businessType
+      itemCodeTypeList.value = res.itemCodeTypeList
+      fromInventoryStatuses.value = res.fromInventoryStatuses
+      toInventoryStatuses.value = res.toInventoryStatuses
+      goScan(true)
+    } else {
+      showErrorMessage(res.message)
+    }
+  })
+})
+const closeScan = () => {
+  resizeCollapse()
+}
+const resizeCollapse = () => {
+  nextTick((r) => {
+    comIssueDetailCardRef.value.forEach((r) => {
+      r.resizeCollapse()
+    })
+  })
+}
+const goScan = (editPosition) => {
+  comIssueRequestPopupRef.value.openRequestPopup(editPosition)
+}
+
+// 确定需求信息
+
+const requestConfirm = (action, item) => {
+  if (item.itemCode == '' || item.itemCode == null) return
+
+  const request = requestList.value.find((r) => r.itemCode == item.itemCode)
+  if (request == undefined) {
+    requestList.value.push(item)
+    getRecommendInfo(item)
+  } else {
+    comMessageRef.value.showQuestionMessage(`已经存在物料[${item.itemCode}]的需求信息,是否要修改?`, (res) => {
+      if (res) {
+        request.qty = item.qty
+        detailSource.value.forEach((detail) => {
+          const index = detail.Items.findIndex((r) => {
+            r.itemCode == item.itemCode
+          })
+          detail.Items.splice(index, 1)
+        })
+        getRecommendInfo(item)
+      }
+    })
+  }
+}
+
+const getRecommendInfo = (item) => {
+  proxy.$modal.loading('加载中....')
+  getBalanceByBatchOffShelf(item.itemCode, item.qty)
+    .then((res) => {
+      if (res.data == null) {
+        showMessage('未获取到推荐信息')
+      } else {
+        if (res.data.length > 0) {
+          workShopCode.value = item.workshopCode
+          res.data.forEach((r) => {
+            r.toLocationCode = item.rawLocationCode
+            r.productionLineCode = item.productionLineCode
+            r.workStationCode = item.workStationCode
+            // r.itemCode = item.itemCode;
+            r.itemName = item.itemName
+            r.uom = item.uom
+            subList.value.push(r)
+          })
+          detailSource.value = getDataSource(detailSource.value, subList.value)
+          // 要修改一下数量
+          detailSource.value.forEach((detail) => {
+            detail.Items.forEach((i) => {
+              const request = requestList.value.find((r) => r.itemCode == i.itemCode)
+              i.qty = request.qty
+            })
+          })
+          resizeCollapse()
+        } else {
+          showMessage('列表数据为0')
+        }
+        uni.hideLoading()
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
+
+const caclcQty = () => {
+  let totalQty = 0
+  detailSource.value.subList.forEach((res) => {
+    totalQty = calc.add(totalQty, res.qty)
+  })
+  detailSource.value.totalQty = totalQty
+}
+constopenScanDetailPopup = () => {
+  const datacontent = {}
+  // 克隆对象，深度克隆，防止双向绑定同一个变量
+  // Object.assign(datacontent, this.detailSource);
+  const dataContent = {
+    allowModifyPackingNumber: 'FALSE',
+    outInventoryStatuses: fromInventoryStatuses.value
+  }
+  comScanIssuePackRef.value.openScanPopup(detailSource.value, dataContent)
+}
+
+const closeScanPopup = () => {
+  updateCommitBtn()
+}
+
+constupdateData = (record) => {
+  const requestLocation = detailSource.value.find((r) => r.toLocationCode == record.toLocationCode)
+  const item = requestLocation.Items.find((r) => r.itemCode == record.itemCode)
+  let itemHandleQty = 0
+  if (item != undefined) {
+    item.Locations.forEach((l) => {
+      const batch = l.Batchs.find((b) => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch)
+      let handleQty = 0
+      if (batch != undefined) {
+        batch.Records.forEach((res) => {
+          handleQty = calc.add(handleQty, res.qty)
+        })
+        batch.handleQty = handleQty
+        itemHandleQty = calc.add(itemHandleQty, handleQty)
+      }
+    })
+  }
+  resizeCollapse()
+  // item.handleQty=itemHandleQty;
+  // this.closeScan();
+}
+const removeItemCode = () => {
+  const isClear = detailSource.value[0].Items.length == 0
+  if (isClear) {
+    clearData()
+    comIssueRequestPopupRef.value.initData()
+  }
+}
+const setParams = () => {
+  const subList = []
+  const createTime = getCurrDateTime()
+  const creator = store.id
+  detailSource.value.forEach((toLocationCode) => {
+    toLocationCode.Items.forEach((item) => {
+      item.Locations.forEach((fromLocation) => {
+        fromLocation.Batchs.forEach((batch) => {
+          const subItem = batch.detail
+          subItem.recordList = []
+          if (batch.Records.length > 0) {
+            batch.Records.forEach((r) => {
+              const record = {}
+              record.handleQty = r.qty
+
+              record.fromPackingNumber = r.packingNumber
+              record.fromBatch = r.batch
+              record.fromContainerNumber = r.ContainerNumber
+
+              record.toContainerNumber = r.ContainerNumber
+              record.toInventoryStatus = r.inventoryStatus
+              record.toLocationCode = subItem.toLocationCode
+              record.fromLocationCode = fromLocation.fromLocationCode
+              record.supplierCode = r.supplierCode
+
+              const single_price = r.singlePrice == null ? 0 : r.singlePrice
+
+              record.singlePrice = single_price
+              record.amount = single_price * r.qty
+
+              // 使用在途库不改变管理模式
+              const info = getPackingNumberAndBatch(managementList.value, r.itemCode, r.packingNumber, r.batch)
+              record.toPackingNumber = info.packingNumber
+              record.toBatch = info.batch
+              subItem.recordList.push(record)
+            })
+            subList.push(subItem)
+          }
+        })
+      })
+    })
+  })
+
+  dataContent.value.subList = subList
+  dataContent.value.createTime = createTime
+  dataContent.value.creator = creator
+  return dataContent.value
+}
+const submit = () => {
+  proxy.$modal.loading('提交中....')
+
+  // 目前任务只到一个库位
+  const itemCodes = []
+  const locationCode = detailSource.value[0].toLocationCode
+  detailSource.value.forEach((toLocation) => {
+    toLocation.Items.forEach((item) => {
+      itemCodes.push(item.itemCode)
+    })
+  })
+
+  // 获取管理模式，封装参数
+  getManagementPrecisions(itemCodes, locationCode, (res) => {
+    if (res.success) {
+      managementList.value = res.list
+      submitJob()
+    } else {
+      uni.hideLoading()
+      showErrorMessage(res.message)
+    }
+  })
+}
+
+const submitJob = () => {
+  const params = setParams()
+  console.log('提交参数', JSON.stringify(params))
+  issueRecordSubmit(params)
+    .then((res) => {
+      uni.hideLoading()
+      if (res.data) {
+        showCommitSuccessMessage(`提交成功<br>生成发料记录<br>${res.data}`)
+      } else {
+        showErrorMessage(`提交失败:【${res.msg}】`)
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
+
+const showCommitSuccessMessage = (hint) => {
+  comMessageRef.value.showSuccessMessage(hint, (res) => {
+    if (res) {
+      clearData()
+      comIssueRequestPopup.value.initData()
+    }
+  })
+}
+
+const clearData = () => {
+  subList.value = [] // 接口返回的任务subList
+  detailSource.value = [] // 绑定在页面上的数据源
+  detailOptions.value = []
+  scanOptions.value = []
+  workShopCode.value = ''
+  requestList.value = []
+  dataContent.value = {}
+  managementList.value = []
+}
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message, (res) => {
+    if (res) {
+      afterCloseMessage()
+    }
+  })
+}
+const showErrorMessage = (message) => {
+  comMessageRef.value.showErrorMessage(message, (res) => {
+    if (res) {
+    }
+  })
+}
+</script>
+
+<style></style>
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index 83d78c44..6674959b 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -218,7 +218,7 @@ export default {
         itemCode: result.package.itemCode,
         qty: result.package.qty
       }
-      getBalanceByBatchOffShelf(item.itemCode, item.qty)
+      getBalanceByBatchOffShelf(item.itemCode, item.qty, 'Repleinment')
         .then((res) => {
           if (res.data == null) {
             that.showErrorMessage('未获取到推荐信息')
diff --git a/src/pages/repleinsh/record/repleinshRecordV1.vue b/src/pages/repleinsh/record/repleinshRecordV1.vue
new file mode 100644
index 00000000..8cae0661
--- /dev/null
+++ b/src/pages/repleinsh/record/repleinshRecordV1.vue
@@ -0,0 +1,465 @@
+<template>
+  <view class="page-wraper">
+    <view class="">
+      <com-blank-view @goScan="showRequestPopup" v-if="detailSource.length == 0"></com-blank-view>
+    </view>
+    <view class="page-wraper" v-if="detailSource.length > 0">
+      <view class="page-main">
+        <scroll-view scroll-y="true" class="page-main-scroll">
+          <view class="" v-for="(toLocation, index) in detailSource" :key="index">
+            <view class="u-p-t-20" style="background: white">
+              <view class="page-header" style="background-color: #f5f5f5 !important; margin: 0px 20rpx">
+                <view class="text_lightblue fontsize-16">目标库位:{{ toLocation.toLocationCode }}</view>
+              </view>
+              <com-issue-detail-card ref="comRepleinshDetailCard" :dataContent="toLocation" @updateData="updateData"> </com-issue-detail-card>
+            </view>
+            <!-- <view class='split_line'></view> -->
+          </view>
+        </scroll-view>
+      </view>
+
+      <view class="page-footer">
+        <view class="uni-flex u-col-center space-between padding_20" style="background-color: ghostwhite; width: 100%">
+          <button class="btn_single_commit" style="flex: 1" hover-class="btn_commit_after" @click="submit">提交</button>
+        </view>
+      </view>
+      <win-scan-button @goScan="openScanPopup"></win-scan-button>
+    </view>
+    <com-repleinsh-request-popup ref="comRepleinshRequestPopupRef" :toLocationAreaTypeList="toLocationAreaTypeList" @confirm="requestConfirm" :itemCodeTypeList="itemCodeTypeList"> </com-repleinsh-request-popup>
+    <win-scan-button v-if="detailSource.length > 0" @goScan="openScanDetailPopup"></win-scan-button>
+    <com-scan-issue-pack ref="comScanIssuePackRef" @closeScan="closeScan" @updateData="updateData"> </com-scan-issue-pack>
+    <com-message ref="comMessageRef" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, getCurrentInstance, nextTick } from 'vue'
+import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { repleinshRecordSubmit, getBalanceByBatchOffShelf } from '@/api/request2.js'
+
+import { calc } from '@/common/calc.js'
+
+import { goHome, getCurrDateTime, getPackingNumberAndBatch } from '@/common/basic.js'
+
+import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js'
+
+import { getDetailOption, getDetailRemoveOption, getDetailEditRemoveOption } from '@/common/array.js'
+
+import { getBusinessType, calcHandleQty } from '@/common/record.js'
+
+import { getDataSource } from '@/pages/issue/js/issue.js'
+
+import { getManagementPrecisions } from '@/common/balance.js'
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+import comRepleinshRequestPopup from '@/pages/repleinsh/coms/comRepleinshRequestPopup.vue'
+import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+import { useCountStore } from '@/store'
+// 获取自定义的store
+const store = useCountStore()
+const { proxy } = getCurrentInstance()
+const id = ref('')
+const receiptJob = ref({})
+const subList = ref([]) // 接口返回的任务subList
+const detailSource = ref([]) // 绑定在页面上的数据源
+const businessTypeInfo = ref({})
+const fromLocationCode = ref('')
+const toLocationCode = ref('')
+const toLocationAreaTypeList = ref([])
+const allowModifyLocation = ref(false)
+const businessType = ref({})
+const requestList = ref([])
+const managementList = ref([])
+const dataContent = ref({})
+const itemCodeTypeList = ref([])
+const comRepleinshDetailCard = ref()
+const comRepleinshRequestPopupRef = ref()
+const comScanIssuePackRef = ref()
+const comMessageRef = ref()
+onLoad((option) => {
+  const typeCode = 'Repleinment'
+  getBusinessType(typeCode, (res) => {
+    if (res.success) {
+      businessType.value = res.businessType
+      itemCodeTypeList.value = res.itemCodeTypeList
+      toLocationAreaTypeList.value = res.toLocationAreaTypeList
+      showRequestPopup()
+    } else {
+      showErrorMessage(res.message)
+    }
+  })
+})
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome()
+  }
+})
+const closeScan = () => {
+  resizeCollapse()
+}
+const resizeCollapse = () => {
+  nextTick((r) => {
+    comRepleinshDetailCard.value.forEach((r) => {
+      r.resizeCollapse()
+    })
+  })
+}
+const showRequestPopup = () => {
+  comRepleinshRequestPopupRef.value.openRequestPopup()
+}
+// 确定需求信息
+const requestConfirm = (action, item) => {
+  if (item.itemCode == '' || item.itemCode == null) return
+  const request = requestList.value.find((r) => r.itemCode == item.itemCode)
+  if (request == undefined) {
+    requestList.value.push(item)
+    getRecommendInfo(item)
+  } else {
+    comMessageRef.value.showQuestionMessage(`已经存在物料[${item.itemCode}]的需求信息,是否要修改?`, (res) => {
+      if (type == 'itemCode') {
+        request.qty = item.qty
+        detailSource.value.forEach((detail) => {
+          const index = detail.Items.findIndex((r) => {
+            r.itemCode == item.itemCode
+          })
+          detail.Items.splice(index, 1)
+        })
+        getRecommendInfo(item)
+      }
+    })
+  }
+}
+const getRecommendInfo = (item) => {
+  proxy.$modal.loading('加载中...')
+  getBalanceByBatchOffShelf(item.itemCode, item.qty)
+    .then((res) => {
+      if (res.data == null) {
+        showMessage('未获取到推荐信息')
+      } else {
+        if (res.data.length > 0) {
+          res.data.forEach((r) => {
+            r.toLocationCode = item.toLocation.code
+            r.itemName = item.itemName
+            r.uom = item.uom
+            subList.value.push(r)
+          })
+
+          detailSource.value = getDataSource(detailSource.value, subList.value)
+          // 要修改一下数量
+          detailSource.value.forEach((detail) => {
+            detail.Items.forEach((i) => {
+              const request = requestList.value.find((r) => r.itemCode == i.itemCode)
+              i.qty = request.qty
+            })
+          })
+          // that.resizeCollapse();
+        } else {
+          showMessage('列表数据为0')
+        }
+        uni.hideLoading()
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
+
+const caclcQty = () => {
+  const totalQty = 0
+  detailSource.value.subList.forEach((res) => {
+    totalQty.value = calc.add(totalQty, res.qty)
+  })
+  detailSource.value.totalQty = totalQty
+}
+
+const openScanDetailPopup = () => {
+  const datacontent = {}
+  // 克隆对象，深度克隆，防止双向绑定同一个变量
+  // Object.assign(datacontent, this.detailSource);
+  const dataContent1 = {
+    allowModifyPackingNumber: 'FALSE',
+    outInventoryStatuses: fromInventoryStatuses.value
+  }
+  comScanIssuePackRef.value.openScanPopup(detailSource.value, dataContent1)
+}
+
+const updateData = (record) => {
+  const requestLocation = detailSource.value.find((r) => r.toLocationCode == record.toLocationCode)
+  const item = requestLocation.Items.find((r) => r.itemCode == record.itemCode)
+  let itemHandleQty = 0
+  if (item != undefined) {
+    item.Locations.forEach((l) => {
+      const batch = l.Batchs.find((b) => (b.packingNumber == record.packingNumber || b.packingNumber == null || b.packingNumber == '') && b.batch == record.batch)
+      let handleQty = 0
+      if (batch != undefined) {
+        batch.Records.forEach((res) => {
+          handleQty = calc.add(handleQty, res.qty)
+        })
+        batch.handleQty = handleQty
+        itemHandleQty = calc.add(itemHandleQty, handleQty)
+      }
+    })
+  }
+  resizeCollapse()
+  // item.handleQty=itemHandleQty;
+  // this.closeScan();
+}
+
+const calcHandleQty = () => {
+  for (const item of detailSource.value) {
+    item.qty = 0
+    for (const detail of item.subList) {
+      if (detail != undefined) {
+        item.qty = calc.add(item.qty, detail.qty)
+      }
+    }
+  }
+}
+
+const removeItem = (index, item) => {
+  detailSource.value.splice(index, 1)
+}
+const removePack = () => {
+  for (let i = 0; i < detailSource.value.length; i++) {
+    const item = detailSource.value[i]
+    if (item.subList.length == 0) {
+      detailSource.value.splice(i, 1)
+    }
+  }
+  updateData()
+}
+
+const openScanPopup = () => {
+  scanPopup.value.openScanPopupForType(fromLocationCode.value, businessType.value)
+}
+
+const showFromLocationPopup = () => {
+  nextTick(() => {
+    scanLocationCode.value.openScanPopup()
+  })
+}
+
+const closeScanPopup = () => {
+  if (scanPopup.value != undefined) {
+    scanPopup.value.closeScanPopup()
+  }
+}
+
+const scanPopupGetFocus = () => {
+  if (scanPopup.value != undefined) {
+    scanPopup.value.getfocus()
+  }
+}
+
+const submit = () => {
+  if (getScanCount()) {
+    showErrorMessage('当前扫描数为0,请先扫描在提交')
+    return
+  }
+  uni.showLoading({
+    title: '提交中....',
+    mask: true
+  })
+
+  // 目前任务只到一个库位
+  const itemCodes = []
+  const locationCode = detailSource.value[0].toLocationCode
+  detailSource.value.forEach((toLocation) => {
+    toLocation.Items.forEach((item) => {
+      itemCodes.push(item.itemCode)
+    })
+  })
+
+  // 获取管理模式，封装参数
+  getManagementPrecisions(itemCodes, locationCode, (res) => {
+    if (res.success) {
+      managementList.value = res.list
+      submitJob()
+    } else {
+      uni.hideLoading()
+      showErrorMessage(res.message)
+    }
+  })
+}
+
+const submitJob = () => {
+  const params = setParams()
+  repleinshRecordSubmit(params)
+    .then((res) => {
+      uni.hideLoading()
+      if (res.data) {
+        showCommitSuccessMessage(`提交成功<br>生成补料记录<br>${res.data}`)
+      } else {
+        showErrorMessage(`提交失败[${res.msg}]`)
+      }
+    })
+    .catch((error) => {
+      uni.hideLoading()
+      showErrorMessage(error)
+    })
+}
+const setParams = () => {
+  const subList = []
+  const createTime = getCurrDateTime()
+  const creator = store.id
+  detailSource.value.forEach((toLocationCode) => {
+    toLocationCode.Items.forEach((item) => {
+      item.Locations.forEach((fromLocation) => {
+        fromLocation.Batchs.forEach((batch) => {
+          const subItem = batch.detail
+          subItem.recordList = []
+
+          if (batch.Records.length > 0) {
+            batch.Records.forEach((r) => {
+              const record = {}
+              record.handleQty = r.qty
+
+              record.fromPackingNumber = r.packingNumber
+              record.fromBatch = r.batch
+              record.fromContainerNumber = r.ContainerNumber
+
+              record.toContainerNumber = r.ContainerNumber
+              record.toInventoryStatus = r.inventoryStatus
+              record.toLocationCode = subItem.toLocationCode
+              record.fromLocationCode = fromLocation.fromLocationCode
+              record.supplierCode = r.supplierCode
+
+              // 使用在途库不改变管理模式
+              const info = getPackingNumberAndBatch(this.managementList, r.itemCode, r.packingNumber, r.batch)
+              record.toPackingNumber = info.packingNumber
+              record.toBatch = info.batch
+              subItem.recordList.push(record)
+            })
+            subList.push(subItem)
+          }
+        })
+      })
+    })
+  })
+
+  dataContent.value.subList = subList
+  dataContent.value.createTime = createTime
+  dataContent.value.creator = creator
+  return dataContent.value
+}
+
+const getScanCount = () => {
+  let scanCount = 0
+  const subList = []
+  detailSource.value.forEach((toLocationCode) => {
+    toLocationCode.Items.forEach((item) => {
+      item.Locations.forEach((fromLocation) => {
+        fromLocation.Batchs.forEach((batch) => {
+          const subItem = batch.detail
+          subItem.recordList = []
+
+          if (batch.Records.length > 0) {
+            batch.Records.forEach((r) => {
+              const record = {}
+              record.handleQty = r.qty
+              subItem.recordList.push(record)
+            })
+            subList.push(subItem)
+          }
+        })
+      })
+    })
+  })
+  return (scanCount = subList.length)
+}
+
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message, (res) => {
+    if (res) {
+    }
+  })
+}
+const showErrorMessage = (message) => {
+  comMessageRef.value.showErrorMessage(message, (res) => {
+    if (res) {
+    }
+  })
+}
+const showScanMessage = (message) => {
+  comMessageRef.value.showScanMessage(message)
+}
+
+const afterCloseMessage = () => {
+  scanPopupGetFocus()
+}
+const closeScanMessage = () => {
+  scanPopupGetFocus()
+}
+const getLocation = (location, code) => {
+  getToLocationCode(location, code)
+}
+const getFromLocationCode = (location, code) => {
+  fromLocationCode.value = code
+  openScanPopup()
+}
+const getToLocationCode = (location, code) => {
+  // if (this.fromLocationCode == code) {
+  // 	uni.showToast({
+  // 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+  // 		duration: 2000
+  // 	})
+  // 	return
+  // }
+  toLocationCodeInfo.value = location
+  toLocationCode.value = code
+}
+
+const showCommitSuccessMessage = (hint) => {
+  comMessageRef.value.showSuccessMessage(hint, (res) => {
+    clearData()
+  })
+}
+const clearData = () => {
+  fromLocationCode.value = ''
+  detailSource.value = []
+  requestList.value = []
+  dataContent.value = {}
+  managementList.value = []
+}
+</script>
+
+<style scoped lang="scss">
+page {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+}
+
+.page-wraper {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+.page-main {
+  flex: 1;
+  position: relative;
+}
+
+.page-main-scroll {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.page-main-list {
+  /*  height: 80rpx;
+	    line-height: 80rpx; */
+  text-align: center;
+  background: #e0e0e0;
+}
+</style>