From 05f5eb60204e6d829b82a101fb2b2a408529f5eb Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 9 Dec 2025 18:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  4 +-
 .../SecondPhase/slitting/SlittingFeeding.vue  | 43 +++++++++++++++++--
 utils/getData2.js                             |  9 +++-
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 97459e1..cc95671 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.4.6",
-    "versionCode" : 146,
+    "versionName" : "1.4.1",
+    "versionCode" : 141,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index 81de4fb..bb54b04 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -116,8 +116,9 @@
 				</view>
 			</view>
 			<view class="zd-row submitbar">
-				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
-				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">确认</button>
+				<button class="zd-col-6 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
+				<button class="zd-col-8 btn-submit btn-success letter-30" @tap="modalToSure">确认</button>
+				<button class="zd-col-8 btn-submit btn-success letter-30" @tap="moveContainer">母卷转移</button>
 			</view>
 		</view>
 		<view v-if="active" class="msg_mask"></view>
@@ -129,7 +130,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn, moveContainer} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -302,6 +303,42 @@
 					this.disabled1 = false
 				}
 			},
+			/** 母卷转移 */
+			async moveContainer () {
+				this.disabled1 = true
+				if (!this.val3) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '起点不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.val4) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '母卷号不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				try {
+					let res = await moveContainer(this.val3, this.val4)
+					this.disabled1 = false
+					this.active = false
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
 			/** 空轴送回 */
 			async _feedingVehicleReturn (type) {
 				this.disabled2 = true
diff --git a/utils/getData2.js b/utils/getData2.js
index f4f817d..307df96 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -418,7 +418,14 @@ export const feedingVehicleReturn = (code, type) => request({
 		type: type
 	}
 })
-
+// 1.6母卷转移
+export const moveContainer = (code, cn) => request({
+	url:'api/pda/feeding/moveContainer',
+	data: {
+		point_code: code,
+		container_name: cn,
+	}
+})
 /**
  * 任务管理
  */