From 84df82529d0393b45f05774ac3ccda6c4ff46aef Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 10 Nov 2025 18:59:16 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=87=BA=E5=BA=93=E5=88=86=E6=8B=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl   |   3 +
 locale/en.json             |  13 +++-
 locale/vi.json             |  15 ++++-
 locale/zh-Hans.json        |  13 +++-
 pages.json                 |   7 ++
 pages/home/home.vue        |   3 +-
 pages/manage/ckfj.vue      | 134 +++++++++++++++++++++++++++++++++++++
 pages/manage/dwgx.vue      |   2 +-
 pages/manage/rgjl.vue      |   2 +-
 pages/manage/sgyk.vue      |   2 +-
 pages/manage/zprk.vue      |   2 +-
 static/image/menu/RF08.png | Bin 0 -> 2390 bytes
 utils/getData.js           |   8 +++
 13 files changed, 192 insertions(+), 12 deletions(-)
 create mode 100644 pages/manage/ckfj.vue
 create mode 100644 static/image/menu/RF08.png

diff --git a/common/style/layout.styl b/common/style/layout.styl
index 2dee157..b033e71 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -506,4 +506,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	width 70%
 	height 4rpx
 	background-color #fff
+}
+uni-button[size=mini] {
+	white-space: nowrap;
 }
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index 8a8553f..a907a82 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -32,7 +32,8 @@
 		"ManualWarehouseTransfer": "Manual Warehouse Transfer",
 		"OperationManagement": "Operation Management",
 		"PointUpdate": "Point Update",
-		"QueryMaterials": "Query Materials"
+		"QueryMaterials": "Query Materials",
+		"Outboundsorting": "Outbound sorting"
 	},
 	"utils": {
 		"loading": "Loading...",
@@ -75,7 +76,12 @@
 		"Pointlocationcarrier": "Point - location carrier",
 		"Unitmeasurement": "Unit of measurement",
 		"WarehousingType": "Warehousing Type",
-		"MaterialQRCode": "Material QR Code"
+		"MaterialQRCode": "Material QR Code",
+		"ReturnwarehousePalletCode": "Return - to - warehouse Pallet Code",
+		"OutboundPalletCode": "Outbound Pallet Code",
+		"OutboundPalletStorageLocation": "Outbound Pallet Storage Location",
+		"QtyReturnedWarehouse": "Quantity Returned to Warehouse",
+		"OutboundQty": "Outbound Quantity"
 	},
 	"th": {
 		"MaterialBoxNumber": "Material Box Number",
@@ -91,5 +97,8 @@
 	"toast": {
 		"boxnotduplicated": "The material box number cannot be repeated.",
 		"quantitynonnegative": "The quantity must be a non - negative number"
+	},
+	"modal": {
+		"checkSorting": "The outbound pallet location is【{location}】, return quantity【{returnNum}】, outbound quantity【{outNum}】. Please check if the sorting is correct?"
 	}
 }
\ No newline at end of file
diff --git a/locale/vi.json b/locale/vi.json
index 20afbd9..5e51ed5 100644
--- a/locale/vi.json
+++ b/locale/vi.json
@@ -32,7 +32,8 @@
         "ManualWarehouseTransfer": "Chuyển kho thủ công",
         "OperationManagement": "Quản lý hoạt động",
         "PointUpdate": "Cập nhật điểm",
-        "QueryMaterials": "Tra cứu vật liệu"
+        "QueryMaterials": "Tra cứu vật liệu",
+		"Outboundsorting": "Phân loại xuất kho"
     },
     "utils": {
         "loading": "Đang tải...",
@@ -75,7 +76,12 @@
         "Pointlocationcarrier": "Vật chở tại điểm",
 		"Unitmeasurement": "Đơn vị đo",
 		"WarehousingType": "Loại nhập kho",
-		"MaterialQRCode": "Mã QR vật liệu"
+		"MaterialQRCode": "Mã QR vật liệu",
+		"ReturnwarehousePalletCode": "Mã thùng đựng trả về kho",
+		"OutboundPalletCode": "Mã thùng đựng xuất kho",
+		"OutboundPalletStorageLocation": "Vị trí lưu trữ thùng đựng xuất kho",
+		"QtyReturnedWarehouse": "Số lượng trả về kho",
+		"OutboundQty": "Số lượng xuất kho"
     },
     "th": {
         "MaterialBoxNumber": "Số hộp vật liệu",
@@ -91,5 +97,8 @@
     "toast": {
         "boxnotduplicated": "Số hộp vật liệu không được trùng nhau",
         "quantitynonnegative": "Số lượng phải là số không âm"
-    }
+    },
+	"modal": {
+		"checkSorting": "Vị trí lưu trữ thùng đựng xuất kho là【{location}】, số lượng trả lại【{returnNum}】, số lượng xuất kho【{outNum}】. Vui lòng kiểm tra xem phân loại có chính xác không?"
+	}
 }
\ No newline at end of file
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 5a0269e..37f1081 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -32,7 +32,8 @@
 		"ManualWarehouseTransfer": "手工移库",
 		"OperationManagement": "作业管理",
 		"PointUpdate": "点位更新",
-		"QueryMaterials": "查询物料"
+		"QueryMaterials": "查询物料",
+		"Outboundsorting": "出库分拣"
 	},
 	"utils": {
 		"loading": "加载中...",
@@ -75,7 +76,12 @@
 		"Pointlocationcarrier": "点位载具",
 		"Unitmeasurement": "计量单位",
 		"WarehousingType": "入库类型",
-		"MaterialQRCode": "物料二维码"
+		"MaterialQRCode": "物料二维码",
+		"ReturnwarehousePalletCode": "回库托盘码",
+		"OutboundPalletCode": "出库托盘码",
+		"OutboundPalletStorageLocation": "出库托盘库位",
+		"QtyReturnedWarehouse": "回库数量",
+		"OutboundQty": "出库数量"
 	},
 	"th": {
 		"MaterialBoxNumber": "料框号",
@@ -91,5 +97,8 @@
 	"toast": {
 		"boxnotduplicated": "料框号不能重复",
 		"quantitynonnegative": "数量必须为非负数"
+	},
+	"modal": {
+		"checkSorting": "出库托盘库位为【{location}】，回库数量【{returnNum}】个，出库数量【{outNum}】个，请核对分拣是否正确？"
 	}
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 97755fb..1b7c4a1 100644
--- a/pages.json
+++ b/pages.json
@@ -95,6 +95,13 @@
                 "navigationStyle": "custom"
             }
             
+        },
+        {
+        	"path" : "pages/manage/ckfj",
+        	"style" : 
+        	{
+        		"navigationStyle": "custom"
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 70e6b7a..06e73e7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -38,7 +38,8 @@
 					{title: this.$t('home.ManualMaterialRequest'), icon: 'RF04', path: '/pages/manage/rgjl'},
 					{title: this.$t('home.ManualWarehouseTransfer'), icon: 'RF05', path: '/pages/manage/sgyk'},
 					{title: this.$t('home.OperationManagement'), icon: 'RF06', path: '/pages/manage/zygl'},
-					{title: this.$t('home.PointUpdate'), icon: 'RF07', path: '/pages/manage/dwgx'}
+					{title: this.$t('home.PointUpdate'), icon: 'RF07', path: '/pages/manage/dwgx'},
+					{title: this.$t('home.Outboundsorting'), icon: 'RF08', path: '/pages/manage/ckfj'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/manage/ckfj.vue b/pages/manage/ckfj.vue
new file mode 100644
index 0000000..b00958c
--- /dev/null
+++ b/pages/manage/ckfj.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="zd_container">
+		<!-- 出库分拣 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="is-required">
+					<view class="filter_label">{{$t('label.ReturnwarehousePalletCode')}}</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-18">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+					<button class="mini-btn" type="primary" size="mini" style="margin-right: 0;margin-left: 10rpx;" @tap="_getOutAndReturnNumByReturnVehicleCode(val1)">{{$t('button.search')}}</button>
+				</view>
+				<view>
+					<view class="filter_label">{{$t('label.OutboundPalletCode')}}</view>
+					<search-box
+					v-model="val2"
+					/>
+				</view>
+				<view>
+					<view class="filter_label">{{$t('label.OutboundPalletStorageLocation')}}</view>
+					<search-box
+					v-model="val3"
+					/>
+				</view>
+				<view>
+					<view class="filter_label">{{$t('label.QtyReturnedWarehouse')}}</view>
+					<input type="text" class="filter_input filter_input_disabled" v-model="currentData.return_num" disabled>
+				</view>
+				<view>
+					<view class="filter_label">{{$t('label.OutboundQty')}}</view>
+					<input type="text" class="filter_input filter_input_disabled" v-model="currentData.out_num" disabled>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !val3 || JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="toSure">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getOutAndReturnNumByReturnVehicleCode, outSortingSubmit} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				currentData: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getOutAndReturnNumByReturnVehicleCode(e)
+				}
+			},
+			async _getOutAndReturnNumByReturnVehicleCode (e) {
+				try {
+					let res = await getOutAndReturnNumByReturnVehicleCode(e)
+					if (res && res.status === '200') {
+						this.currentData = res.data
+					} else {
+						this.currentData = {}
+					}
+				} catch (e) {
+					this.currentData = {}
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.currentData = {}
+				this.disabled = false
+			},
+			toSure () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val3 || JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				uni.showModal({
+					title: this.$t('common.tip'),
+					content: this.$t('modal.checkSorting', {
+						location: this.val3,
+						returnNum: this.currentData.return_num,
+						outNum: this.currentData.out_num
+					}),
+					success: (res) => {
+						if (res.confirm) {
+							this._outSortingSubmit()
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				});
+			},
+			async _outSortingSubmit () {
+				try {
+					let res = await outSortingSubmit(this.val1, this.val2, this.val3)
+					if (res.status === '200') {
+						this.clearUp()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/manage/dwgx.vue b/pages/manage/dwgx.vue
index bc4fe3f..16d5ffe 100644
--- a/pages/manage/dwgx.vue
+++ b/pages/manage/dwgx.vue
@@ -14,7 +14,7 @@
 						<view class="zd-col-18">
 							<search-box v-model="val2"/>
 						</view>
-						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_schPointGetPoint">{{$t('button.search')}}</button>
+						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0;margin-left: 10rpx;" @tap="_schPointGetPoint">{{$t('button.search')}}</button>
 					</view>
 				</view>
 			</view>
diff --git a/pages/manage/rgjl.vue b/pages/manage/rgjl.vue
index 18f4b14..2032fcb 100644
--- a/pages/manage/rgjl.vue
+++ b/pages/manage/rgjl.vue
@@ -16,7 +16,7 @@
 						<view class="zd-col-18">
 							<input type="text" class="filter_input" v-model="val2">
 						</view>
-						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_linegetMaterialDtl">{{$t('button.search')}}</button>
+						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0;margin-left: 10rpx;" @tap="_linegetMaterialDtl">{{$t('button.search')}}</button>
 					</view>
 				</view>
 				<view class="is-required">
diff --git a/pages/manage/sgyk.vue b/pages/manage/sgyk.vue
index eb0845d..81d676a 100644
--- a/pages/manage/sgyk.vue
+++ b/pages/manage/sgyk.vue
@@ -14,7 +14,7 @@
 						<view class="zd-col-18">
 							<search-box v-model="val2"/>
 						</view>
-						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_movestorQuerydtl">{{$t('button.search')}}</button>
+						<button class="mini-btn" type="primary" size="mini" style="margin-right: 0;margin-left: 10rpx;" @tap="_movestorQuerydtl">{{$t('button.search')}}</button>
 					</view>
 				</view>
 				<view class="is-required">
diff --git a/pages/manage/zprk.vue b/pages/manage/zprk.vue
index 56596aa..671183d 100644
--- a/pages/manage/zprk.vue
+++ b/pages/manage/zprk.vue
@@ -21,7 +21,7 @@
 						@handleChange="handleChange"
 						/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_getVehicleMaterial(val1)">{{$t('button.search')}}</button>
+					<button class="mini-btn" type="primary" size="mini" style="margin-right: 0;margin-left: 10rpx;" @tap="_getVehicleMaterial(val1)">{{$t('button.search')}}</button>
 				</view>
 				<view class="is-required">
 					<view class="filter_label">{{$t('label.WarehouseArea')}}</view>
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
new file mode 100644
index 0000000000000000000000000000000000000000..30c871f3c82ecc4e9bc9851577dc0b125a22aaa7
GIT binary patch
literal 2390
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

literal 0
HcmV?d00001

diff --git a/utils/getData.js b/utils/getData.js
index bf1df93..34b2c05 100644
--- a/utils/getData.js
+++ b/utils/getData.js
@@ -136,4 +136,12 @@ export const addTaskV2 = (Value, point1, point2) => request({
 export const dictDetail = (code) => request({
 	url:'api/dict/dictDetail?code=' + code + '&page=0&size=9999',
 	method: 'GET'
+})
+export const getOutAndReturnNumByReturnVehicleCode = (code) => request({
+	url:'api/pda/iosOut/getOutAndReturnNumByReturnVehicleCode',
+	data: {return_vehicle_code: code}
+})
+export const outSortingSubmit = (code, vcode, ost) => request({
+	url:'api/pda/iosOut/outSortingSubmit',
+	data: {return_vehicle_code: code, out_vehicle_code: vcode, out_struct_code: ost}
 })
\ No newline at end of file