From d3517108bad2eaf2b7b55cc18a00ca47f205cf52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Mon, 28 Oct 2024 16:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E5=92=8C=E7=9B=B4=E6=8E=A5=E8=A1=A5=E6=96=99=202024/8?=
 =?UTF-8?q?/8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScanBalance.vue   | 232 ++++++++++++------
 src/pages.json                                |   2 +-
 src/pages/issue/record/directIssue.vue        |   4 +-
 .../record/directRepleinshRecord.vue          |   9 +-
 4 files changed, 172 insertions(+), 75 deletions(-)

diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index b11ca3a9..0433921f 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -3,20 +3,24 @@
     <uni-popup ref="popup" :mask-click="false">
       <view class="popup_box">
         <view class="pop_title uni-flex space-between">
-          <view class="" style="font-size: 35rpx"> 扫描{{ title }} </view>
+          <view class="" style="font-size: 35rpx;">
+            扫描{{title}}
+          </view>
 
           <view class="">
-            <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image>
+            <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+                   @click="closeScanPopup()"></image>
           </view>
         </view>
         <view class="">
           <view class="">
-            <win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
+            <win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
+                          :isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
           </view>
         </view>
       </view>
     </uni-popup>
-    <balance-select ref="balanceSelect" @onSelectItem="selectBalanceItem"></balance-select>
+    <balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
   </view>
   <comMessage ref="comMessage"></comMessage>
 </template>
@@ -24,15 +28,28 @@
 <script>
 import winComScan from '@/mycomponents/scan/winComScan.vue'
 import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
-import { getBalanceByManagementPrecisionByPacking } from '@/common/balance.js'
-
-import { getBalanceByParams, getBasicItemByCode } from '@/api/request2.js'
+import {
+  getBalanceByManagementPrecisionByPacking,
+} from '@/common/balance.js';
 
-import { getListLocationAreaTypeDesc, checkDirectoryItemExist, getDirectoryItemArray, getLocationAreaTypeName, getInventoryStatusDesc, getListItemTypeDesc, getItemTypeInfo } from '@/common/directory.js'
+import {
+  getBalanceByParams,
+  getBasicItemByCode,
+  getBalanceByFilter
+} from '@/api/request2.js';
 
+import {
+  getListLocationAreaTypeDesc,
+  checkDirectoryItemExist,
+  getDirectoryItemArray,
+  getLocationAreaTypeName,
+  getInventoryStatusDesc,
+  getListItemTypeDesc,
+  getItemTypeInfo
+} from '@/common/directory.js';
 export default {
   name: 'winScanPack',
-  emits: ['getBalance'],
+  emits: ["getBalance"],
   components: {
     winComScan,
     balanceSelect
@@ -48,10 +65,9 @@ export default {
     },
     headerType: {
       type: String,
-      default: 'HPQ,HMQ'
+      default: "HPQ,HMQ"
     },
-    balanceFromInventoryStatuses: {
-      // 是否传fromInventoryStatuses
+    balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
       type: Boolean,
       default: true
     },
@@ -76,6 +92,8 @@ export default {
       fromLocation: '',
       fromLocationList: [],
       fromLocationAreaTypeList: [],
+
+      toLocationAreaTypeList: [],
       locationOnFocus: false,
       businessType: {},
       inventoryStatus: [],
@@ -86,29 +104,93 @@ export default {
       resultData: {}
     }
   },
-  created() {},
+  created() {
+
+  },
   methods: {
     openScanPopup(businessType) {
       this.businessType = businessType
       this.fromInventoryStatuses = getDirectoryItemArray(businessType.outInventoryStatuses)
       this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes)
+      this.toLocationAreaTypeList = getDirectoryItemArray(businessType.inAreaTypes)
       this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
       this.$refs.popup.open('bottom')
     },
 
     getScanResult(result) {
-      this.resultData = result
+      this.resultData = result;
       if (!result.package) {
-        this.showErrorMessage(`${result.label.code}包装信息为空`)
-        return
+        this.showErrorMessage(result.label.code + "包装信息为空")
+        return;
+      }
+      this.getItemCodeType(result.package.itemCode, callBack => {
+
+        this.getToLocationBalance(this.resultData)
+
+        //this.queryBalance(this.resultData)
+      })
+    },
+
+    //查询到目标库位的库存余额
+    getToLocationBalance(result) {
+      uni.showLoading({
+        title: '查询中',
+        mask: true
+      })
+      var filters = []
+      if (result.package.parentNumber) {
+        var packingNumber = result.package.parentNumber + "," + result.package.number;
+        filters.push({
+          column: "packingNumber",
+          action: "in",
+          value: packingNumber
+        })
+      } else {
+        filters.push({
+          column: "packingNumber",
+          action: "==",
+          value: result.package.packingNumber
+        })
+      }
+
+      filters.push({
+        column: "itemCode",
+        action: "==",
+        value: result.package.itemCode
+      })
+      filters.push({
+        column: "batch",
+        action: "==",
+        value: result.package.batch
+      })
+
+      filters.push({
+        column: "areaType",
+        action: "in",
+        value: this.toLocationAreaTypeList.join(',')
+      })
+
+
+      var params = {
+        filters: filters,
+        pageNo: 1,
+        pageSize: 100,
       }
-      this.getItemCodeType(result.package.itemCode, (callBack) => {
-        this.queryBalance(this.resultData)
+      getBalanceByFilter(params).then(res => {
+        uni.hideLoading()
+        if (res.data.list.length > 0) {
+          this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+        } else {
+          this.queryBalance(this.resultData);
+        }
+        // callback(res.data)
+      }).catch(err => {
+        this.showErrorMessage(err.message);
       })
     },
 
     queryBalance(result) {
-      const params = {
+      var params = {
         itemCode: result.package.itemCode,
         batch: result.label.batch,
         packingNumber: result.label.packingNumber,
@@ -121,84 +203,92 @@ export default {
         title: '查询中',
         mask: true
       })
-      getBalanceByParams(params)
-        .then((res) => {
-          uni.hideLoading()
-          if (res.data.length == 0) {
-            const status = getInventoryStatusDesc(params.inventoryStatus)
-            const areaType = getListLocationAreaTypeDesc(params.areaType)
-            const hint = `按物料号 [${params.itemCode}] <br>` + `包装号 [${params.packingNumber}] <br>` + `批次 [${params.batch}] <br>` + `状态 [${status}] <br>` + `库区 [${areaType}] <br>` + '未查找到库存余额'
-            this.showErrorMessage(hint)
-          } else if (res.data.length == 1) {
-            result.balance = res.data[0]
-            if (result.label.packingNumber != result.balance.packingNumber) {
-              result.balance.lableQty = result.label.qty
-            }
-            this.$emit('getBalance', result)
-            // this.closeScanPopup()
-          } else {
-            // 多条记录
-            this.$refs.balanceSelect.openPopup(res.data)
+      getBalanceByParams(params).then(res => {
+        uni.hideLoading()
+        if (res.data.length == 0) {
+          var status = getInventoryStatusDesc(params.inventoryStatus)
+          var areaType = getListLocationAreaTypeDesc(params.areaType)
+          var hint =
+              "按物料号 [" + params.itemCode + "] <br>" +
+              "包装号 [" + params.packingNumber + "] <br>" +
+              "批次 [" + params.batch + "] <br>" +
+              "状态 [" + status + "] <br>" +
+              "库区 [" + areaType + "] <br>" +
+              "未查找到库存余额"
+          this.showErrorMessage(hint)
+        } else if (res.data.length == 1) {
+
+          result.balance = res.data[0]
+          if (result.label.packingNumber != result.balance.packingNumber) {
+            result.balance.lableQty = result.label.qty
           }
-        })
-        .catch((error) => {
-          uni.hideLoading()
-          this.showErrorMessage(error)
-        })
+          this.$emit("getBalance", result)
+          // this.closeScanPopup()
+        } else {
+          //多条记录
+          this.$refs.balanceSelect.openPopup(res.data);
+        }
+
+      }).catch(error => {
+        uni.hideLoading()
+        this.showErrorMessage(error)
+      })
     },
+
     getItemCodeType(itemCode, callBack) {
       uni.showLoading({
-        title: '加载中',
+        title: "加载中",
         mask: true
       })
-      getBasicItemByCode(itemCode)
-        .then((res) => {
-          if (res.data != null && res.data.list.length > 0) {
-            const result = res.data.list[0]
-            const status = result.available
-            const { type } = result
-            if (status == 'TRUE') {
-              if (checkDirectoryItemExist(this.itemTypesList, type)) {
-                if (this.verifyCategory) {
-                  if (result.category == 'LCJ' || result.category == 'BJ') {
-                    callBack()
-                  } else {
-                    this.showErrorMessage('扫描物料的种类不是【量产件】或者【备件】')
-                  }
-                } else {
+      getBasicItemByCode(itemCode).then(res => {
+        if (res.data != null && res.data.list.length > 0) {
+          var result = res.data.list[0];
+          var status = result.available;
+          var type = result.type;
+          if (status == "TRUE") {
+            if (checkDirectoryItemExist(this.itemTypesList, type)) {
+              if (this.verifyCategory) {
+                if (result.category == 'LCJ' || result.category == 'BJ') {
                   callBack()
+                } else {
+                  this.showErrorMessage("扫描物料的种类不是【量产件】或者【备件】")
                 }
               } else {
-                const hint = getListItemTypeDesc(this.itemTypesList)
-                uni.hideLoading()
-                this.showErrorMessage(`扫描物料[${itemCode}]是[${getItemTypeInfo(type).label}],需要的物料类型是[${hint}]`)
+                callBack()
               }
             } else {
+              var hint = getListItemTypeDesc(this.itemTypesList);
               uni.hideLoading()
-              this.showErrorMessage(`物料【${itemCode}】不可用`)
+              this.showErrorMessage("扫描物料[" + itemCode + "]是[" +
+                  getItemTypeInfo(type).label + "],需要的物料类型是[" + hint + "]")
             }
           } else {
             uni.hideLoading()
-            this.showErrorMessage(`未查找到物料【${itemCode}】`)
+            this.showErrorMessage('物料【' + itemCode + '】不可用');
           }
-        })
-        .catch((error) => {
+        } else {
           uni.hideLoading()
-          this.showErrorMessage(error)
-        })
+          this.showErrorMessage('未查找到物料【' + itemCode + '】');
+        }
+      }).catch(error => {
+        uni.hideLoading();
+        this.showErrorMessage(error)
+      })
     },
+
     showErrorMessage(message) {
-      this.$refs.comMessage.showErrorMessage(message, (res) => {
+      this.$refs.comMessage.showErrorMessage(message, res => {
         if (res) {
           if (this.$refs.comscan) {
             this.$refs.comscan.getfocus()
           }
         }
-      })
+      });
     },
+
     selectBalanceItem(item) {
       this.resultData.balance = item
-      this.$emit('getBalance', this.resultData)
+      this.$emit("getBalance", this.resultData)
       // this.closeScanPopup()
     },
     closeScanPopup() {
@@ -224,4 +314,4 @@ export default {
   height: auto;
   max-height: 300rpx;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index bfab7353..921099e0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -690,7 +690,7 @@
 		{
 			"path": "pages/repleinsh/record/repleinshRecord",
 			"style": {
-				"navigationBarTitleText": "补料记录",
+				"navigationBarTitleText": "超市先进先出补料",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					"autoBackButton": "true"
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 4536a2a8..eb5ebad4 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -246,9 +246,11 @@ const getScanResult = (result) => {
             const manyBlances = balances.list.filter((r) => r.locationCode != fromLocationCode.value)
             if (manyBlances.length > 0) {
               locationCode = manyBlances[0].locationCode
+              showErrorMessage(`该包装【${packageInfo.number}】在库位【${locationCode}】已经有库存余额,请重新扫描`)
+            }else {
+              afterGetBalance(result)
             }
           }
-          showErrorMessage(`该包装【${packageInfo.number}】在库位【${locationCode}】已经有库存余额,请重新扫描`)
         }
       }
     }
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 4e4c8452..71654272 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -6,14 +6,19 @@
     <view class="page-wraper" v-if="detailSource.length > 0">
       <view class="page-header">
         <view class="page-header-box">
-          <view class="header_item u-p-t-20" style="font-size: 35rpx; padding: 10rpx"> 来源库位 : {{ fromLocationCode }} </view>
+          <view class="header-view">
+            <view class="header_item u-p-t-20" style="font-size: 35rpx; padding: 10rpx"> 来源库位 : {{ fromLocationCode }} </view>
+          </view>
         </view>
       </view>
       <view class="page-main">
         <scroll-view scroll-y="true" class="page-main-scroll">
           <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
             <view class="">
-              <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>
+              <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>
           </view>
         </scroll-view>