From 649b471e05d091eaf2f042fa8e639ff0d498cac9 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 16 Nov 2022 11:08:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/getData1.js | 59 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/utils/getData1.js b/utils/getData1.js
index cc63015..4ba2ca8 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -1,6 +1,9 @@
 import request from './request.js'
 
-// 生箔生产进度
+
+/**
+ * 生箔生产进度
+ */
 // 1.1生产区域下拉框查询
 export const queryProductArea = (type) => request({
 	url: 'api/pda/raw/queryProductArea',
@@ -16,7 +19,9 @@ export const queryRawFoil = (pcode, cname, parea) => request({
 	}
 })
 
-// 生箔工序
+/**
+ * 生箔工序
+ */
 // 1.1生箔工序初始化查询
 export const queryRawFoilList = (pcode, cname) => request({
 	url: 'api/pda/raw/queryRawFoilList',
@@ -54,7 +59,9 @@ export const finish = (rjo) => request({
 	}
 })
 
-// 烘烤工序
+/**
+ * 烘烤工序
+ */
 // 1.1出入烘箱
 export const ovenInAndOut = (pcode, cname, temp, hours, option) => request({
 	url: 'api/pda/baking/ovenInAndOut',
@@ -94,7 +101,9 @@ export const pointStatusQuery = (pcode, cname) => request({
 })
 
 // 【仓储管理】
-// 生产区发货确认
+/**
+ * 生产区发货确认
+ */
 // 1.1出库初始化查询
 export const stivtQuery = (bno, pcode) => request({
 	url: 'api/pda/st/ivtQuery',
@@ -119,7 +128,9 @@ export const stoutPrint = (bjo) => request({
 	}
 })
 
-// 虚拟区发货确认
+/**
+ * 虚拟区发货确认
+ */
 // 1.1出库初始化查询
 export const virtualbillQuery = (bno, bcode, btype) => request({
 	url: 'api/pda/virtual/billQuery',
@@ -152,7 +163,9 @@ export const virtualoutConfirm = (brows, bno) => request({
 	}
 })
 
-// 空载具出库、空载具入库
+/**
+ * 空载具出库、空载具入库
+ */
 // 1.1空载具出入库
 export const emptyVehiclepointOperate = (pcode, vcode, option) => request({
 	url: 'api/pda/emptyVehicle/pointOperate',
@@ -168,4 +181,38 @@ export const emptyVehiclepointStatusQuery = (pcode) => request({
 	data: {
 		point_code: pcode
 	}
+})
+
+/**
+ * 盘点管理
+ */
+// 1.1盘点单查询
+export const checkQuery = (ccode) => request({
+	url: 'api/pda/check/checkQuery',
+	data: {
+		check_code: ccode
+	}
+})
+// 1.2盘点单明细查询
+export const checkQueryDtl = (ccode) => request({
+	url: 'api/pda/check/checkQueryDtl',
+	data: {
+		check_code: ccode
+	}
+})
+// 1.3保存
+export const saveCheck = (crows, ccode) => request({
+	url: 'api/pda/check/saveCheck',
+	data: {
+		check_rows: crows,
+		check_code: ccode
+	}
+})
+// 1.4确认
+export const confirmCheck = (crows, ccode) => request({
+	url: 'api/pda/check/confirmCheck',
+	data: {
+		check_rows: crows,
+		check_code: ccode
+	}
 })
\ No newline at end of file

From bc30a399a0212f0140dc65f8dbd3aac6bc0c7107 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 16 Nov 2022 14:36:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/XuniDeliveryConfirm.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue
index ad4d8c9..b2a6fc3 100644
--- a/pages/WarehouseManage/XuniDeliveryConfirm.vue
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="虚拟区发货确认"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="虚拟区发货确认"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -52,7 +52,7 @@
 		</view>
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_virtualoutConfirm">出库确认</button>
-			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
+			<button class="submit-button" @tap="_virtualivtQuery">查询</button>
 		</view>
 	</view>
 </template>
@@ -81,6 +81,11 @@
 			this.billCode = option.bill_code
 		},
 		methods: {
+			goIn () {
+				uni.navigateTo({
+					url: `/pages/WarehouseManage/XuniDelivery`
+				})
+			},
 			handleChange (e) {
 				// console.log(e)
 			},

From 7339ee7ce964bdae80009ad6efaecf50b024936a Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 16 Nov 2022 16:13:16 +0800
Subject: [PATCH 3/3] check

---
 pages.json | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index 7adc4f4..042b168 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,7 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-		    "path" : "pages/login/login",
+			"path" : "pages/login/login",
 		    "style": {
 				"navigationStyle": "custom"
 		    }
@@ -144,24 +144,36 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
-    ,{
-            "path" : "pages/ProductManage/EmptyPipeOutStore",
+		,{
+		    "path" : "pages/WarehouseManage/CheckList",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+		,{
+		    "path" : "pages/WarehouseManage/CheckDtl",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
+    ,{
+            "path" : "pages/ProductManage/EmptyPipeOutStore",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-            
-        }
-        ,{
-            "path" : "pages/ProductManage/ZjInStore",
+            
+        }
+        ,{
+            "path" : "pages/ProductManage/ZjInStore",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-            
-        }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",