From c18ccf6b7ef48d7b9f97e63024aeccb013acd6c9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 19 Feb 2025 13:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=A5=BC=E7=94=9F=E4=BA=A7=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue                      |   3 +-
 pages/outbound/produce-out-store-2nd.vue | 102 ++++++++++++++++++-----
 static/image/menu/RF10.png               | Bin 0 -> 3128 bytes
 utils/getData2.js                        |   4 +
 utils/mork2.js                           |  10 ++-
 5 files changed, 95 insertions(+), 24 deletions(-)
 create mode 100644 static/image/menu/RF10.png

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 99b4d2b..37699a1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -52,9 +52,10 @@
 				],
 				menuList: [
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}, {title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '库存出库', path: '/pages/outbound/stock-out-store'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
+					{title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
 					{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]}
 				],
 				show: false,
diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue
index 96eba34..94fa911 100644
--- a/pages/outbound/produce-out-store-2nd.vue
+++ b/pages/outbound/produce-out-store-2nd.vue
@@ -11,19 +11,35 @@
 					<view class="zd-col-16">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange1"
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-8">
-						<span class="filter_label">用料清单编号</span>
+						<span class="filter_label">出库单据编号</span>
 					</view>
 					<view class="zd-col-16">
 						<search-box
 						v-model="val2"
+						@handleChange="handleChange2"
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8">
+						<span class="filter_label">可选物料数</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input">{{selectedNum !== null ? (9 - selectedNum) : null}}</span>
+					</view>
+					<view class="zd-col-8">
+						<span class="filter_label">已选物料数</span>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_input">{{selectedNum}}</span>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -33,18 +49,23 @@
 								<th>选择</th>
 								<th class="td_3"><view class="td_3">物料名称</view></th>
 								<th>物料编码</th>
+								<th>物料状态</th>
 								<th>数量</th>
 								<th>单位</th>
+								<th>单据编码</th>
 								<th>批次号</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
-								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td v-show="e.status === '1'" @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
+								<td v-show="e.status !== '1'"><uni-icons type="smallcircle-filled" size="24" color="#fff"></uni-icons></td>
 								<td class="td_3">{{e.material_name}}</td>
 								<td>{{e.material_code}}</td>
+								<td>{{e.material_status}}</td>
 								<td>{{e.qty}}</td>
 								<td>{{e.unit_name}}</td>
+								<td>{{e.prd_ppbom_no}}</td>
 								<td>{{e.pcsn}}</td>
 							</tr>
 						</tbody>
@@ -53,8 +74,8 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-primary" @tap="_getCtuOrderList">查询</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': checkData.length === 0}" :disabled="disabled" @tap="_ctuOutConfirm">确认</button>
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': checkData.length === 0}" :disabled="disabled" @tap="_ctuOutConfirm">出库物料提交</button>
 		</view>
 	</view>
 </template>
@@ -62,7 +83,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getCtuOrderList, ctuOutConfirm} from '@/utils/getData2.js'
+	import {queryTargetPoint, getCtuOrderList, ctuOutConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -73,6 +94,7 @@
 				title: '',
 				val1: '',
 				val2: '',
+				selectedNum: null, // 已选物料数
 				dataList: [],
 				disabled: false,
 				checkData: []
@@ -82,17 +104,45 @@
 			this.title = options.title
 		},
 		methods: {
-			async _getCtuOrderList () {
+			handleChange1 (e) {
+				this._queryTargetPoint(e)
+			},
+			// 产线站点编码验证
+			async _queryTargetPoint (e) {
+				let res = await queryTargetPoint(e)
+				if (res.code === '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.val1 = res.site_code
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.val1 = ''
+				}
+			},
+			handleChange2 (e) {
+				this._getCtuOrderList(e)
+			},
+			async _getCtuOrderList (e) {
 				try {
-					let res = await getCtuOrderList(this.val1, this.val2)
+					let res = await getCtuOrderList(this.val1, e)
 					if (res.code === '200') {
 						this.checkData = []
-						if (res.content.length > 0) {
-							this.dataList = [...res.content]
-							this.dataList.map(el => {
-								this.$set(el, 'checked', false)
-							})
+						for (let i = 0; i < res.content.length; i++) {
+							if (this.selectedNum < 9 && res.content[i].status === '1') {
+								this.$set(res.content[i], 'checked', true)
+								this.selectedNum += 1
+							} else {
+								this.$set(res.content[i], 'checked', false)
+							}
 						}
+						this.dataList = [...this.dataList, ...res.content]
+						let arr = this.dataList.filter(el => el.checked === true)
+						this.checkData = arr
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -104,18 +154,26 @@
 				}
 			},
 			toCheck (e) {
-				e.checked = !e.checked
-				let arr = this.dataList.filter(el => el.checked === true)
-				if (arr.length > 9) {
-					uni.showToast({
-						title: '最多只能选择9个物料',
-						icon: 'none'
-					})
+				if (!e.checked && this.selectedNum >= 9) {
+					return
+				} else if (!e.checked && this.selectedNum < 9) {
+					e.checked = true
+					this.selectedNum++
+				} else if (e.checked) {
 					e.checked = false
-					arr = this.dataList.filter(el => el.checked === true)
+					this.selectedNum--
 				}
+				let arr = this.dataList.filter(el => el.checked === true)
 				this.checkData = arr
 			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.selectedNum = null
+				this.dataList = []
+				this.disabled = false
+				this.checkData = []
+			},
 			async _ctuOutConfirm () {
 				this.disabled = true
 				if (this.checkData.length === 0) {
@@ -125,7 +183,7 @@
 				try {
 					let res = await ctuOutConfirm(this.val1, this.val2, this.checkData)
 					if (res.code === '200') {
-						this._getCtuOrderList()
+						this.clearUp()
 					}
 					this.disabled = false
 					uni.showToast({
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
new file mode 100644
index 0000000000000000000000000000000000000000..19d6dfd2ecfdc206664cb2ed6105269363a89f30
GIT binary patch
literal 3128
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
SHHUcs0000<MNUMnLSTY-h55$-

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 4815e00..b7f9df9 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -223,6 +223,10 @@ export const outStorageMaterConfirm = (obj) => request({
 /**
  * 二楼生产出库
  */
+export const queryTargetPoint = (scode) => request({
+	url:'api/pdaPalletIostorinv/queryTargetPoint',
+	data: {site_code: scode}
+})
 export const getCtuOrderList = (scode, bcode) => request({
 	url:'api/pda/outStorage/getCtuOrderList?site_code=' + scode + '&bill_code=' + bcode,
 	method: 'GET'
diff --git a/utils/mork2.js b/utils/mork2.js
index fddce3b..12a20cb 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -240,7 +240,7 @@ export const structattrPage = () => {
 export const getCtuOrderList = () => {
 	let res = {
 		"code": "200",
-		content: [{material_name: '1'}, {material_name: '2'}, {material_name: '3'}, {material_name: '4'}, {material_name: '5'}, {material_name: '6'}, {material_name: '7'}, {material_name: '8'}, {material_name: '9'}, {material_name: '10'}, {material_name: '11'}, {material_name: '12'}]
+		content: [{material_name: '1', status: '1'}, {material_name: '2', status: '1'}, {material_name: '3', status: '1'}, {material_name: '4', status: '1'}, {material_name: '5', status: '1'}, {material_name: '6', status: '1'}, {material_name: '7', status: '1'}, {material_name: '8', status: '1'}, {material_name: '9', status: '0'}, {material_name: '10', status: '1'}]
 	}
 	return res
 }
@@ -254,4 +254,12 @@ export const ctuOutConfirm = () => {
 export const getPointStatus = () => {
 	let res = {code: 'a', name: 'ldjlfjl', lock_type: '0'}
 	return res
+}
+export const queryTargetPoint = () => {
+	let res = {
+		code: '200',
+		site_code: 'a102',
+		msg: '查询成功！'
+	}
+	return res
 }
\ No newline at end of file