From c0ee72332ac9ab98ca73eab8c049b05bb1bcd67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 13:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A2=84=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=8A=9F=E8=83=BD=202024/8/2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/array.js                           | 18 ++++-
 src/common/record.js                          | 11 +--
 .../record/recordComDetailCard.vue            | 25 +++++--
 src/mycomponents/scan/winScanPackage.vue      | 14 +++-
 .../record/productPutawayRecord.vue           | 74 ++++++++++++++-----
 5 files changed, 109 insertions(+), 33 deletions(-)

diff --git a/src/common/array.js b/src/common/array.js
index ed1cf95d..27a339c0 100644
--- a/src/common/array.js
+++ b/src/common/array.js
@@ -277,7 +277,23 @@ export function getEditRemoveOption() {
 	return option_edit_remove;
 }
 
-
+//详情编辑移除
+export function getEditLocationRemoveOption() {
+	let option_edit_remove = [{
+		text: '修改\n库位',
+		style: {
+			backgroundColor: '#F1A532'
+		}
+	},
+		{
+			text: '移除',
+			style: {
+				backgroundColor: '#F56C6C'
+			}
+		}
+	];
+	return option_edit_remove;
+}
 // 库存状态字典项
 export function getInventoryStatusArray() {
 	let array = [{
diff --git a/src/common/record.js b/src/common/record.js
index 4bd90e91..08fb2061 100644
--- a/src/common/record.js
+++ b/src/common/record.js
@@ -7,9 +7,9 @@ import {
 } from '@/common/directory.js';
 import { calc } from '@/common/calc'
 import { Decimal } from 'decimal.js';//引入
-	import {
-		deepCopyData
-	} from '@/common/basic.js';
+import {
+	deepCopyData
+} from '@/common/basic.js';
 
 export function createItemInfo(balance, pack) {
 	let item = {
@@ -18,10 +18,11 @@ export function createItemInfo(balance, pack) {
 		packQty: pack.packQty,
 		packUnit: pack.packUnit,
 		qty: new Decimal(balance.qty).toNumber(),
-		handleQty:new Decimal(0).toNumber(),
+		handleQty: new Decimal(0).toNumber(),
 		uom: pack.uom,
 		subList: []
 	}
+	item.containerNumber = pack.parentNumber != null ? pack.parentNumber : pack.number;
 	return item;
 }
 
@@ -34,7 +35,7 @@ export function createDetailInfo(balance, pack) {
 	detail.qty = new Decimal(detail.qty).toNumber();
 	detail.packQty = new Decimal(pack.packQty).toNumber()
 	detail.packUnit = pack.packUnit
-	detail.handleQty =  new Decimal(detail.qty).toNumber() ;
+	detail.handleQty = new Decimal(detail.qty).toNumber() ;
 	detail.package = pack;
 	detail.productionlineCode = pack.productionLineCode; // 制品回收记录需要加的
 	detail.toInventoryStatus = balance.inventoryStatus; // 制品回收记录需要加的
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 554878c4..7e71892b 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -5,6 +5,10 @@
         <template v-slot:title>
           <u-swipe-action :show="false" style="width: 90%" :options="removeOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => removeItem(event, dataContent)">
             <item-qty :dataContent="dataContent" :isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
+            <view style="margin-left: 10px; margin-top: 5px;">
+              <pack title='父包装' :packingCode='dataContent.containerNumber'></pack>
+              <location title='目标库位' :locationCode='dataContent.toLocationCode'></location>
+            </view>
           </u-swipe-action>
         </template>
         <u-swipe-action :show="detail.show" :index="index" v-for="(detail, index) in dataContent.subList" :key="index" :options="detail.scaned ? scanOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="(...event) => swipeClick(event, detail)">
@@ -23,9 +27,11 @@ import { ref, onMounted, nextTick, watch } from 'vue'
 import itemQty from '@/mycomponents/item/itemQty.vue'
 import balance from '@/mycomponents/balance/balance.vue'
 import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+import location from '@/mycomponents/balance/location.vue'
 import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue'
-
-import { getDetailOption, getDetailEditRemoveOption, getClearOption } from '@/common/array.js'
+import pack from '@/mycomponents/balance/pack.vue'
+import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
+import { getDetailOption, getDetailEditRemoveOption, getClearOption,getEditLocationRemoveOption } from '@/common/array.js'
 
 const props = defineProps({
   dataContent: {
@@ -94,16 +100,18 @@ dataContent.value.subList.forEach((item) => {
 onMounted(() => {
   detailOptions.value = getDetailOption()
   scanOptions.value = getDetailEditRemoveOption()
-  removeOptions.value = getClearOption()
+  removeOptions.value = getEditLocationRemoveOption()
 })
 const removeItem = (params, dataContent) => {
   const { text } = removeOptions.value[params[1]]
-  if (text == '清空') {
+  if (text == '移除') {
     comMessageRef.value.showQuestionMessage('确定清空物料及箱码信息?', (res) => {
       if (res) {
-        emit('removeItem')
+        emit('removeItem',dataContent)
       }
     })
+  }else {
+    editLocation(dataContent)
   }
 }
 const swipeClick = (params, item) => {
@@ -141,9 +149,12 @@ const confirm = (qty) => {
   editItem.value.handleQty = qty
   emit('updateData')
 }
-
+const editLocation = (item)=> {
+  editItem.value = item;
+  emit('editLocation', item)
+}
 // 传递给父类
-const emit = defineEmits(['updateData', 'removePack'])
+const emit = defineEmits(['updateData', 'removePack','editLocation'])
 </script>
 
 <style>
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index c82547b0..b136367b 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -153,7 +153,16 @@ const getBalance = (result, callback) => {
   }
   getBalanceByFilter(params)
     .then((res) => {
-      if (res.data.list.length == 0) {
+      if (res.data.list.length > 0) {
+        res.data.list.forEach(r => {
+          if (packageInfo.parentNumber !== null) {
+            r.parentPackingNumber = packageInfo.parentNumber
+          } else {
+            r.parentPackingNumber = packageInfo.number
+          }
+        })
+        callback(res.data.list)
+      } else {
         //如果扫描的是托标签，按托标签没查找到库存再按托标签下的子标签查询库存
         if (packageInfo.subList.length > 0) {
           let packparams = '';
@@ -175,6 +184,7 @@ const getBalance = (result, callback) => {
                 this.packGetFocus();
               })
             } else {
+              res1.data.list.forEach(r => r.parentPackingNumber = packageInfo.number)
               callback(res1.data.list)
             }
           }).catch(err => {
@@ -185,8 +195,6 @@ const getBalance = (result, callback) => {
             this.packGetFocus();
           })
         }
-      } else {
-        callback(res.data)
       }
     })
     .catch((err) => {
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index cf02cc24..3db68c3f 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -11,9 +11,9 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowStatus="true" :isShowToLocation='false' @removeItem="removeItem(index,item)"
-                @updateData="updateData" @removePack="removePack"></record-com-detail-card>
+                @updateData="updateData" @removePack="removePack" @editLocation="showScanToLocation">
+              </record-com-detail-card>
 						</view>
-						<view class="split_line"></view>
 					</view>
 				</scroll-view>
 			</view>
@@ -21,10 +21,12 @@
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
 					<view class="">
-						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation="getToLocationCode"
-							:locationAreaTypeList="tolocationTypeList"></requiredLocation>
+<!--						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation="getToLocationCode"-->
+<!--							:locationAreaTypeList="tolocationTypeList"></requiredLocation>-->
 					</view>
 					<view class="uni-flex uni-row">
+            <button class="btn_single_reject" style="margin-right:5px ;" hover-class="btn_commit_after"
+                    @click="commit">取消</button>
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
 					</view>
 				</view>
@@ -32,6 +34,8 @@
 			<win-scan-button @goScan="openScanPopup"></win-scan-button>
 		</view>
 		<win-scan-package ref="scanPopup" @getResult='getScanResult'></win-scan-package>
+    <win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getToLocationCode'
+                       :locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
 		<com-message ref="comMessageRef" />
 	</view>
 </template>
@@ -39,7 +43,7 @@
 <script setup lang="ts">
 	import { ref, getCurrentInstance, nextTick } from 'vue'
 	import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-	import { productPutawayRecordSubmit } from '@/api/request2.js'
+	import { productPutawayRecordSubmit,getPutawayRecommendLocation } from '@/api/request2.js'
 	import { goHome, getPackingNumberAndBatchByList, deepCopyData, updateTitle } from '@/common/basic.js'
 	import { getPrecisionStrategyList } from '@/common/balance.js'
 
@@ -52,7 +56,7 @@
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import winScanPackage from '@/mycomponents/scan/winScanPackage.vue'
-
+  import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import { useCountStore } from '@/store'
 
 	// 获取自定义的store
@@ -76,6 +80,8 @@
 	const scanPopup = ref()
 	const comMessageRef = ref()
 	const type = ref('')
+  const editItem = ref(null)
+  const toLocationAreaTypeList = ref([])
 	onLoad((option) => {
 		uni.setNavigationBarTitle({
 			title: option.title
@@ -91,7 +97,8 @@
 				businessType.value = res.businessType
 				fromLocationAreaTypeList.value = res.fromLocationAreaTypeList
 				tolocationTypeList.value = res.tolocationTypeList
-				openScanPopup()
+        toLocationAreaTypeList.value = res.toLocationAreaTypeList;
+        openScanPopup()
 			} else {
 				showErrorMessage(res.message)
 			}
@@ -109,13 +116,17 @@
 		const pack = result.package
     result.balance.forEach(
         balance => {
-          var item = detailSource.value.find(res => {
-            if (res.itemCode == balance.itemCode) {
+          let item = detailSource.value.find(res => {
+            if (res.itemCode == balance.itemCode && res.containerNumber == balance.parentPackingNumber) {
               return res
             }
           })
           if (item == undefined) {
             var itemp = createItemInfo(balance, pack);
+            //查询推荐的目标库位
+            getRecommendLocation(balance, res => {
+              itemp.toLocationCode = res.code;
+            })
             let newDetail = createDetailInfo(balance, pack); //
             newDetail.fromInventoryStatus = balance.inventoryStatus;
             itemp.subList.push(newDetail);
@@ -144,6 +155,40 @@
         }
     )
 	}
+  const getRecommendLocation = (balance, callback)=> {
+    uni.showLoading({
+      title: '扫描中...',
+      mask: true
+    })
+
+    let param = {
+      itemCode: balance.itemCode,
+      batch: balance.batch,
+      inventoryStatus: balance.inventoryStatus,
+      supplierCode: '',
+      businessCode: this.bussinessCode
+    };
+    console.log(JSON.stringify(param))
+    getPutawayRecommendLocation(param).then(res => {
+      callback(res.data);
+      uni.hideLoading();
+    }).catch(error => {
+      uni.hideLoading()
+      showErrorMessage(error);
+    })
+  }
+
+  //移除推荐的预占用库位
+  const removeRecommendLocation = ()=> {
+   showMessage('移除推荐的预占用库位')
+  }
+
+  const showScanToLocation = (item)=> {
+    editItem.value = item;
+    setTimeout(r => {
+      scanLocationCode.value.openScanPopup();
+    })
+  }
 
 	const handleCalcHandleQty = () => {
 		calcHandleQty(detailSource.value)
@@ -151,12 +196,14 @@
 
 	const removeItem = (index, item) => {
 		detailSource.value.splice(index, 1)
+    removeRecommendLocation()
 	}
 	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)
+        removeRecommendLocation()
 			}
 		}
 		updateData()
@@ -325,16 +372,9 @@
 	const closeScanMessage = () => {
 		scanPopupGetFocus()
 	}
-	const getLocation = (location, code) => {
-		getFromLocationCode(location, code)
-	}
-	const getFromLocationCode = (location, code) => {
-		fromLocationCode.value = code
-		openScanPopup()
-	}
 	const getToLocationCode = (location, code) => {
 		console.log(code)
-		toLocationCode.value = code
+    editItem.value.toLocationCode = code
 		// detailSource.value.forEach((item) => {
 		//   item.subList.forEach((detail) => {
 		//     detail.toLocationCode = toLocationCode.value