From 29d9888a304dcf1f4fa2d54d10ae174e4b5e8b56 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 28 Oct 2022 10:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=A1=AE=E8=AE=A4add?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  24 +++
 ...eConfirmCp.vue => ProdDeliveryConfirm.vue} |  84 +++++-----
 pages/WarehouseManage/XuniDeliveryConfirm.vue | 153 ++++++++++++++++++
 pages/home/home.vue                           |   2 +-
 utils/getData1.js                             |  29 +++-
 5 files changed, 254 insertions(+), 38 deletions(-)
 rename pages/WarehouseManage/{OutStoreConfirmCp.vue => ProdDeliveryConfirm.vue} (59%)
 create mode 100644 pages/WarehouseManage/XuniDeliveryConfirm.vue

diff --git a/pages.json b/pages.json
index 43f09da..f11ea5c 100644
--- a/pages.json
+++ b/pages.json
@@ -96,6 +96,30 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
+		,{
+		    "path" : "pages/WarehouseManage/ProdDeliveryConfirm",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+		,{
+		    "path" : "pages/WarehouseManage/XuniDeliveryConfirm",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+		,{
+		    "path" : "pages/WarehouseManage/EmptyInStore",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+		,{
+		    "path" : "pages/WarehouseManage/EmptyOutStore",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
     ,{
     "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
     "style": {
diff --git a/pages/WarehouseManage/OutStoreConfirmCp.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue
similarity index 59%
rename from pages/WarehouseManage/OutStoreConfirmCp.vue
rename to pages/WarehouseManage/ProdDeliveryConfirm.vue
index 4bb13c5..6a422d0 100644
--- a/pages/WarehouseManage/OutStoreConfirmCp.vue
+++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="出库确认"></nav-bar>
+		<nav-bar title="生产区发货确认"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -26,34 +26,24 @@
 					<table>
 						<thead>
 							<tr>
-								<th>状态</th>
-								<th>工单号</th>
-								<th>母卷号</th>
-								<th>机台编码</th>
-								<th>产品编码</th>
-								<th>理论长度</th>
-								<th>开始时间</th>
-								<th>结束时间</th>
-								<th>总重量</th>
-								<th>车号</th>
-								<th>生产区域</th>
-								<th>更新时间</th>
+								<th>木箱码</th>
+								<th>子卷号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>重量kg</th>
+								<th>更换外包</th>
+								<th>更换内包</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
-								<td>{{e.status_name}}</td>
-								<td>{{e.mfg_order_name}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId, 'bgyellow': e.colro_flag === '1'}">
+								<td>{{e.package_box_SN}}</td>
 								<td>{{e.container_name}}</td>
-								<td>{{e.point_code}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.theory_height}}</td>
-								<td>{{e.realstart_time}}</td>
-								<td>{{e.realend_time}}</td>
-								<td>{{e.productin_qty}}</td>
-								<td>{{e.agvno}}</td>
-								<td>{{e.product_area}}</td>
-								<td>{{e.update_time}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.product_description}}</td>
+								<td>{{e.net_weight}}</td>
+								<td>{{e.change_out}}</td>
+								<td>{{e.change_in}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -61,7 +51,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">出库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
 			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
 		</view>
 	</view>
@@ -70,7 +60,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryRawFoilList, needEmptyAxis} from '@/utils/getData1.js'
+	import {ivtQuery, stoutConfirm, stoutPrint} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -89,25 +79,25 @@
 			};
 		},
 		created () {
-			this._queryRawFoilList()
+			this._ivtQuery()
 		},
 		methods: {
 			handleChange (e) {
 				// console.log(e)
 			},
 			/** 初始化查询 */
-			async _queryRawFoilList () {
-				let res = await queryRawFoilList(this.val1, this.val2)
+			async _ivtQuery () {
+				let res = await ivtQuery(this.val1, this.val2, '0')
 				this.dataList = [...res.data]	
 			},
-			async _needEmptyAxis () {
+			async _stoutConfirm () {
 				this.disabled1 = true
 				if (!this.pkId) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await needEmptyAxis(this.pkObj)
+					let res = await stoutConfirm(this.pkObj, '0')
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -115,14 +105,34 @@
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
-					this._queryRawFoilList()
+					this._ivtQuery()
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _stoutPrint () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await stoutPrint(this.pkObj)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled1 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._ivtQuery()
 				} catch (e) {
 					this.disabled1 = false
 				}
 			},
 			toCheck (e) {
-				this.pkId = this.pkId === e.container_name ? '' : e.container_name
-				this.pkObj = this.pkId === e.container_name ? e : {}
+				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
+				this.pkObj = this.pkId === e.package_box_SN ? e : {}
 			}
 		}
 	}
@@ -130,7 +140,7 @@
 
 <style lang="stylus">
 	.zd_content
-		padding-bottom 154rpx
+		padding-bottom 77rpx
 	.slide_new table td:first-child, .slide_new table th:first-child
 		width 92rpx
 	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
@@ -138,4 +148,6 @@
 		left 89rpx
 		z-index 102
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgyellow td
+		background-color #E9B451
 </style>
diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue
new file mode 100644
index 0000000..dc5b80a
--- /dev/null
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="虚拟区发货确认"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">木箱</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" 
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>木箱码</th>
+								<th>子卷号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>重量kg</th>
+								<th>更换外包</th>
+								<th>更换内包</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId, 'bgyellow': e.colro_flag === '1'}">
+								<td>{{e.package_box_SN}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.product_description}}</td>
+								<td>{{e.net_weight}}</td>
+								<td>{{e.change_out}}</td>
+								<td>{{e.change_in}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
+			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {ivtQuery, stoutConfirm, stoutPrint} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled1: false
+			};
+		},
+		created () {
+			this._ivtQuery()
+		},
+		methods: {
+			handleChange (e) {
+				// console.log(e)
+			},
+			/** 初始化查询 */
+			async _ivtQuery () {
+				let res = await ivtQuery(this.val1, this.val2, '0')
+				this.dataList = [...res.data]	
+			},
+			async _stoutConfirm () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await stoutConfirm(this.pkObj, '0')
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled1 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._ivtQuery()
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _stoutPrint () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await stoutPrint(this.pkObj)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled1 = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._ivtQuery()
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
+				this.pkObj = this.pkId === e.package_box_SN ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.zd_content
+		padding-bottom 77rpx
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgyellow td
+		background-color #E9B451
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index fa9f8ee..b730912 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}]
+				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDeliveryConfirm', name: '虚拟区发货确认'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
 			};
 		},
 		mounted () {
diff --git a/utils/getData1.js b/utils/getData1.js
index 36d3415..c3b9245 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -91,4 +91,31 @@ export const pointStatusQuery = (pcode, cname) => request({
 	data: {
 		point_code: pcode
 	}
-})
\ No newline at end of file
+})
+
+// 【仓储管理】
+// 出库确认-生产区发货确认、虚拟区发货确认
+// 1.1出库初始化查询
+export const ivtQuery = (bno, pcode, option) => request({
+	url: 'api/pda/st/ivtQuery',
+	data: {
+		box_no: bno,
+		point_code: pcode,
+		option: option
+	}
+})
+// 1.1出库确认
+export const stoutConfirm = (bjo, option) => request({
+	url: 'api/pda/st/outConfirm',
+	data: {
+		box_jo: bjo,
+		option: option
+	}
+})
+// 1.1出库确认
+export const stoutPrint = (bjo) => request({
+	url: 'api/pda/st/outPrint',
+	data: {
+		box_jo: bjo
+	}
+})