From d072b1230991ff4d2162b0dc18c7963bcf79b1a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 12 Nov 2024 08:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E8=BF=81=E7=A7=BBVue2=E5=8D=87=E7=BA=A7Vu?=
 =?UTF-8?q?e3=2010/25-11/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemQty.vue            |  6 +-
 src/pages/deliver/job/deliverJob.vue         |  2 +-
 src/pages/deliver/record/deliverRecord.vue   | 73 +++++++++++++++++---
 src/pages/purchaseReceipt/job/receiptJob.vue |  2 +-
 4 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index 5cea8f33..d104e6f3 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -1,8 +1,6 @@
 <template>
-  <view class="uni-flex uni-row space-between center u-p-t-20 u-p-b-20" style="padding-left:10px;: 100%; border-bottom: 1px solid rgba(230, 230, 2300.5)">
-    <view style="flex: 1">
-      <item :dataContent="dataContent"></item>
-    </view>
+  <view class="uni-flex uni-row space-between center u-p-t-20 u-p-b-20" style="flex: 1;padding-left:10px;: 100%; border-bottom: 1px solid rgba(230, 230, 2300.5)">
+    <item :dataContent="dataContent"></item>
     <view>
       <balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
       <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 24ceae63..18ab4fee 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -103,7 +103,7 @@ const getList = (type) => {
   if (checkedToday.value) {
     filters.push({
       column: 'create_time',
-      action: 'betweeen',
+      action: 'between',
       value: todayTime.value
     })
   }
diff --git a/src/pages/deliver/record/deliverRecord.vue b/src/pages/deliver/record/deliverRecord.vue
index e66c7c6f..5ce15271 100644
--- a/src/pages/deliver/record/deliverRecord.vue
+++ b/src/pages/deliver/record/deliverRecord.vue
@@ -8,7 +8,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="">
-              <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" :isShowLocation="true" @removeItem="removeItem(index, item)" @updateData="updateData" @removePack="removePack"> </record-com-detail-card>
+              <record-com-detail-card :dataContent="item" :index="index"
+                                      :settingParam="dataContent" :isShowLocation="true"
+                                      @removeItem="removeItem(index, item)" :isShowParentToLocation="false"
+                                      @updateData="updateData" @removePack="removePack">
+              </record-com-detail-card>
             </view>
             <view class="split_line"></view>
           </view>
@@ -54,7 +58,9 @@ import { goHome, getPackingNumberAndBatchByList, deepCopyData } from '@/common/b
 import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js'
 
 import { getPrecisionStrategyList } from '@/common/balance.js'
-
+import {
+  calc
+} from '@/common/calc.js';
 import { getBusinessType, createItemInfo, createDetailInfo, calcHandleQty } from '@/common/record.js'
 
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
@@ -87,6 +93,7 @@ const scanLocationCodeRef = ref()
 const comMessageRef = ref()
 const showCustomer = ref(false)
 const toWarehouseCode = ref('')
+const managementType = ref('')
 onLoad((option) => {
   uni.setNavigationBarTitle({
     title: option.title
@@ -123,7 +130,15 @@ onNavigationBarButtonTap((e) => {
     goHome()
   }
 })
-const getScanResult = (result) => {
+const getScanResult = (result,managementTypeParams)=> {
+  managementType.value = managementTypeParams
+  if (managementTypeParams == "BY_BATCH" || managementTypeParams == "BY_QUANTITY") {
+    setDataBatch(result)
+  } else {
+    setData(result)
+  }
+}
+const setData = (result) => {
   const { balance } = result
   const { label } = result
   const pack = result.package
@@ -154,6 +169,39 @@ const getScanResult = (result) => {
   }
   handleCalcHandleQty()
 }
+const setDataBatch = (result)=>{
+  let balance = result.balance;
+  let label = result.label;
+  let pack = result.package;
+  let labelQty =result.label.qty;
+  let balanceQty =result.balance.qty;
+  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); //
+    itemp.subList.push(newDetail);
+    detailSource.value.push(itemp)
+  } else {
+    let detail = item.subList.find(r => {
+      if (r.batch == balance.batch &&
+          r.locationCode == balance.locationCode &&
+          r.inventoryStatus == balance.inventoryStatus) {
+        return r;
+      }
+    })
+    if (detail == undefined) {
+      let newDetail = createDetailInfo(balance, pack);
+      item.subList.push(newDetail);
+    } else {
+      detail.handleQty = calc.add(detail.handleQty, result.label.qty)
+    }
+  }
+  handleCalcHandleQty();
+}
 
 const handleCalcHandleQty = () => {
   calcHandleQty(detailSource.value)
@@ -173,11 +221,15 @@ const removePack = () => {
 }
 
 const openScanPopup = () => {
-  if (fromLocationCode.value == '') {
-    showFromLocationPopup()
-    return
+  if (businessType.value) {
+    if (fromLocationCode.value == "") {
+      showFromLocationPopup();
+      return
+    }
+    scanPopup.value.openScanPopupForType(fromLocationCode.value, businessType.value)
+  } else {
+    getBusinessType()
   }
-  scanPopup.value.openScanPopupForType(fromLocationCode.value, businessType.value)
 }
 
 const showFromLocationPopup = () => {
@@ -228,8 +280,13 @@ const commit = () => {
         if (res.success) {
           console.log(5555)
           managementList.value = res.list
-
           const params = setParams()
+          let obj = params.subList.find(item=>item.balanceQty < item.handleQty)
+          if(obj){
+            comMessageRef.value.showConfirmWarningModal('批次[' +obj.batch + ']数量[' + obj.handleQty + ']不允许大于库存数量[' +obj.balanceQty + ']')
+            uni.hideLoading()
+            return
+          }
           deliverRecordSubmit(params)
             .then((res) => {
               uni.hideLoading()
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 120ee225..30e25618 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -397,7 +397,7 @@ const getScanResult = (result) => {
         showMessage(error)
       })
   } catch (e) {
-    showMessage(`${error}\n扫描[${result.scanMessage}]`)
+    showMessage(`${e}\n扫描[${result.scanMessage}]`)
   }
 }
 defineExpose({