diff --git a/api/warehouse/warehose.js b/api/warehouse/warehose.js
index d5ebeaa..cb2e0b1 100644
--- a/api/warehouse/warehose.js
+++ b/api/warehouse/warehose.js
@@ -1,6 +1,6 @@
 import upload from '@/utils/upload'
 import request from '@/utils/request'
-
+// 入库接口 ========
 // 获取库位信息
 export function getProductLocationInfo(params) {
 	return request({
@@ -73,3 +73,70 @@ export function handlerIntoProductWarehouse(data) {
 	})
 }
 
+// 一般退库
+export function handlErexitwarehouse(params) {
+	return request({
+		url: '/mes/wm/exitwarehouse/common',
+		method: 'get',
+		params
+	})
+}
+
+// 2 根据箱标签的批次号，获取成品库内的信息
+export function getInfoByPatchCode(params) {
+	return request({
+		url: '/mes/wm/WmMaterial/getInfoByPatchCode',
+		method: 'get',
+		params
+	})
+}
+
+// 出库接口 =========
+
+/**
+ * 获取出货单（物料+客户）详情
+ * @param {Id}
+ */
+export function getWmOutOrder(id) {
+	return request({
+		url: '/mes/wm/WmOutOrder/' + id,
+		method: 'get'
+	})
+}
+
+/**
+ * 5.成品出库
+ * @param {Id}
+ */
+export function doMaterialOut(data) {
+	return request({
+		url: '/mes/wm/WmOutOrder/doMaterialOut',
+		method: 'post',
+		data
+	})
+}
+
+/**
+ * 5.出库单完成
+ * @param {Id}
+ */
+export function doOverOutorderplan(params) {
+	return request({
+		url: '/mes/wm/WmOutOrder/over_outorderplan',
+		method: 'get',
+		params
+	})
+}
+
+// 移库接口
+/**
+ * 移库（物料+客户）
+ * @data id,location
+ */
+export function UpdateWmGoodsOutProduction(data) {
+	return request({
+		url: '/mes/wm/WmOutOrder',
+		method: 'PUT',
+		data: data,
+	})
+}
\ No newline at end of file
diff --git a/api/warehouse/wmGoodsNowProduction.js b/api/warehouse/wmGoodsNowProduction.js
new file mode 100644
index 0000000..108471c
--- /dev/null
+++ b/api/warehouse/wmGoodsNowProduction.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+/**
+* 成品库当前货物表分页查询
+* @param {查询条件} data
+*/
+export function listWmGoodsNowProduction(query) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+/**
+* 新增成品库当前货物表
+* @param data
+*/
+export function addWmGoodsNowProduction(data) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction',
+    method: 'post',
+    data: data,
+  })
+}
+/**
+* 修改成品库当前货物表
+* @param data
+* 主键：id
+* goodsNumAction 盘点零件号
+* locationCode 库存编号
+*/
+export function updateWmGoodsNowProduction(data) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction',
+    method: 'PUT',
+    data: data,
+  })
+}
+/**
+* 获取成品库当前货物表详情
+* @param {Id}
+*/
+export function getWmGoodsNowProduction(id) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction/' + id,
+    method: 'get'
+  })
+}
+
+/**
+* 删除成品库当前货物表
+* @param {主键} pid
+*/
+export function delWmGoodsNowProduction(pid) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction/' + pid,
+    method: 'delete'
+  })
+}
diff --git a/components/package-card/package-card.vue b/components/package-card/package-card.vue
index 1d7b6f5..b083825 100644
--- a/components/package-card/package-card.vue
+++ b/components/package-card/package-card.vue
@@ -25,18 +25,19 @@ export default {
 	props: {
 		packageInfo: {
 			default: {
+				id:-1,
 				// 工单号
-				workoderID:'240305021',
+				workoderID:'',
 				// 批次号(工单号+箱号+班组)
-				patchCode: 'BNW240312023_18B1',
+				patchCode: '',
 				// 零件号
-				partNumner: '0215.000.801-6SU',
+				partNumner: '',
 				// 描述
-				productionDescribe: 'D365支架-幻影黒-后右',
+				productionDescribe: '',
 				// 出厂日期/生产日期
-				productionTime: '20240315',
+				productionTime: '',
 				// 此箱数量
-				quantity: 10,
+				quantity: 0,
 				// 货物内部编号
 				originalCode:''
 			}
@@ -51,7 +52,7 @@ export default {
 <style scoped>
 .package-card-box {
 	width: 100%;
-	height: 220px;
+	height: 260px;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
diff --git a/components/pda-scan-input/index.vue b/components/pda-scan-input/index.vue
index 488885c..9145cb7 100644
--- a/components/pda-scan-input/index.vue
+++ b/components/pda-scan-input/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="input-box">
 		<!-- <input :adjust-position="false" :focus="isFocus" type="text" v-model="search" @confirm="getInfo" @blur="isFocus = true" /> -->
-		<input type="text" v-model.trim="search" @confirm="getInfo($event)"/>
+		<input type="text" v-model.trim="search" @confirm="getInfo($event)" />
 	</view>
 </template>
 
@@ -11,7 +11,7 @@ export default {
 	name: 'pda-scan-input',
 	props: {
 		type: {
-			// 1-仓库扫码 2-成品满箱扫码
+			// 1-仓库扫码 2-成品满箱扫码 3-扫出库单 4-退库
 			default: 1,
 			type: Number
 		}
@@ -50,6 +50,7 @@ export default {
 		emitInputChange(data, type) {
 			this.$emit('getInfo', data, type);
 		},
+		// 获取扫码信息
 		async getInfo(e) {
 			const text = e.target.value;
 			const type = this.type;
@@ -58,100 +59,158 @@ export default {
 				this.isFocus = true;
 			}, 1500);
 			if (type === 1) {
-				// 是否为库位码
-				const locationCheckData = {
-					production_location_code: text
-				};
-				const checkRes = await WarehoseApi.isProductionLocation(locationCheckData);
-				if (checkRes.code !== 200 || !checkRes.data) {
-					uni.showModal({
-						title: '提示',
-						content: '仓库编号异常！',
-						showCancel:false,
-						confirmText: '确定'
-					});
-					return;
-				}
-				const getProductLocationData = {
-					locationcode: locationCheckData.production_location_code,
-					warehouse_num: 1
-				};
-				const WarehoseRes = await WarehoseApi.getProductLocationInfo(getProductLocationData);
-				if (WarehoseRes.code !== 200 || !WarehoseRes.data) {
-					uni.showModal({
-						title: '提示',
-						content: '获取仓库信息异常！',
-						showCancel:false,
-						confirmText: '确定'
-					});
-					return;
-				}
-				// 待返回的结果数据
-				let emitData = {
-					warehoseInfo: WarehoseRes.data
-				};
-				this.emitInputChange(emitData, 1);
+				this.handleScanWareHouseCode(text);
 			} else if (type === 2) {
-				const package_code = text;
-				// 成品满箱扫码
-				const locationCheckData = {
-					package_code
-				};
-				// 判断是否是箱号
-				const checkRes = await WarehoseApi.isProductionPackage(locationCheckData);
-				if (checkRes.code !== 200) {
-					uni.showModal({
-						title: '提示',
-						content: '成品箱号异常！',
-						showCancel:false,
-						confirmText: '确定'
-					});
-					return;
-				}
-				if (checkRes.data === 0) {
-					uni.showModal({
-						title: '提示',
-						content: checkRes.msg,
-						showCancel:false,
-						confirmText: '确定'
-					});
-					return;
-				} else if (checkRes.data === 2) {
-					uni.showModal({
-						title: '提示',
-						content: checkRes.msg,
-						showCancel:false,
-						confirmText: '确定'
-					});
-					return;
-				} else if (checkRes.data === 1) {
-					// 判断是否为满箱
-					const isFullRes = await WarehoseApi.isFullPackage(locationCheckData);
-					if (isFullRes.code !== 200 || !isFullRes.data) {
-						uni.showModal({
-							title: '提示',
-							content: '该标签不为满箱标签！',
-							showCancel:false,
-							confirmText: '确定'
-						});
-						return;
-					}
-					const resolutionData = {
-						code: package_code
-					};
-					const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
-					if (emitRes.code !== 200 || emitRes.data === null) {
-						uni.showModal({
-							title: '提示',
-							content: '该箱号数据解析异常！',
-							showCancel:false,
-							confirmText: '确定'
-						});
-						return;
-					}
-					this.emitInputChange(emitRes.data, 2);
-				}
+				this.handleScanGoodsCode(text);
+			} else if (type === 3) {
+				this.handleScanDeliveryOrderCode(text);
+			} else if (type === 4) {
+				this.handleScanStockReturnCode(text);
 			}
+		},
+		// type = 1 入库扫仓库编码
+		async handleScanWareHouseCode(text) {
+			// 是否为库位码
+			const locationCheckData = {
+				production_location_code: text
+			};
+			const checkRes = await WarehoseApi.isProductionLocation(locationCheckData);
+			if (checkRes.code !== 200 || !checkRes.data) {
+				uni.showModal({
+					title: '提示',
+					content: '仓库编号异常！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			const getProductLocationData = {
+				locationcode: locationCheckData.production_location_code,
+				warehouse_num: 1
+			};
+			const WarehoseRes = await WarehoseApi.getProductLocationInfo(getProductLocationData);
+			if (WarehoseRes.code !== 200 || !WarehoseRes.data) {
+				uni.showModal({
+					title: '提示',
+					content: '获取仓库信息异常！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			// 待返回的结果数据
+			let emitData = {
+				warehoseInfo: WarehoseRes.data
+			};
+			this.emitInputChange(emitData, 1);
+		},
+		// type = 2 入库扫货物编码
+		async handleScanGoodsCode(text) {
+			let package_code = text;
+			// 成品满箱扫码
+			let locationCheckData = {
+				package_code
+			};
+			// 判断是否是箱号
+			const checkRes = await WarehoseApi.isProductionPackage(locationCheckData);
+			if (checkRes.code !== 200) {
+				uni.showModal({
+					title: '提示',
+					content: '成品箱号异常！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			if (checkRes.data === 0) {
+				uni.showModal({
+					title: '提示',
+					content: checkRes.msg,
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			} else if (checkRes.data === 2) {
+				uni.showModal({
+					title: '提示',
+					content: checkRes.msg,
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			} else if (checkRes.data === 1) {
+				// 判断是否为满箱
+				const isFullRes = await WarehoseApi.isFullPackage(locationCheckData);
+				if (isFullRes.code !== 200 || !isFullRes.data) {
+					uni.showModal({
+						title: '提示',
+						content: '该标签不为满箱标签！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				let resolutionData = {
+					code: package_code
+				};
+				const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
+				if (emitRes.code !== 200 || emitRes.data === null) {
+					uni.showModal({
+						title: '提示',
+						content: '该箱号数据解析异常！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				this.emitInputChange(emitRes.data, 2);
+			}
+		},
+		// type = 3 扫出货单
+		async handleScanDeliveryOrderCode(text) {
+			let id = text;
+			const getWmOutOrderRes = await WarehoseApi.getWmOutOrder(id);
+			if(getWmOutOrderRes.code != 200){
+				uni.showModal({
+					title: '提示',
+					content: '出库单号异常！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			this.emitInputChange(getWmOutOrderRes.data, 3);
+		},
+		// type = 4 退货扫货物编码
+		async handleScanStockReturnCode(text) {
+			const checkData = {
+				originalCode: text
+			};
+			// 判断是否仓库中有记录
+			const checkRes = await WarehoseApi.isExistedWarehouse(checkData);
+			if (!checkRes.data) {
+				uni.showModal({
+					title: '提示',
+					content: '该编码不在仓库记录中:' + checkRes.msg,
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			const resolutionData = {
+				code: text
+			};
+			const emitRes = await WarehoseApi.resolutionPackage(resolutionData);
+			if (emitRes.code !== 200 || emitRes.data === null) {
+				uni.showModal({
+					title: '提示',
+					content: '该箱号数据解析异常！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			this.emitInputChange(emitRes.data, 4);
 		}
 	}
 };
diff --git a/manifest.json b/manifest.json
index ed869f8..a69d283 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,80 +1,84 @@
 {
-	"name": "干巷仓库PDF-APP",
-	"appid": "__UNI__A67E78B",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	"app-plus": {
-		"usingComponents": true,
-		"nvueCompiler": "uni-app",
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {
-			"Barcode": {}
-		},
-		"distribute": {
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			"ios": {},
-			"sdkConfigs": {}
-		}
-	},
-	"quickapp": {},
-	"mp-weixin": {
-		"appid": "wxccd7e2a0911b3397",
-		"setting": {
-			"urlCheck": false,
-			"es6": false,
-			"minified": true,
-			"postcss": true
-		},
-		"optimization": {
-			"subPackages": true
-		},
-		"usingComponents": true
-	},
-	"vueVersion": "2",
-	"h5": {
-		"template": "static/index.html",
-		"devServer": {
-			"port": 9090,
-			"https": false,
-			"disableHostCheck": true,
-			"proxy": {
-				"/api": {
-					"target": "http://192.168.90.92:8888",
-					"pathRewrite": {
-						"^/api": ""
-					}
-				}
-			}
-		},
-		"title": "RuoYi-App",
-		"router": {
-			"mode": "hash",
-			"base": "./"
-		}
-	}
-}
\ No newline at end of file
+    "name" : "干巷仓库PDF-APP",
+    "appid" : "__UNI__A67E78B",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Barcode" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {
+                "ad" : {}
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wxccd7e2a0911b3397",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : false,
+            "minified" : true,
+            "postcss" : true
+        },
+        "optimization" : {
+            "subPackages" : true
+        },
+        "usingComponents" : true
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "template" : "static/index.html",
+        "devServer" : {
+            "port" : 9090,
+            "https" : false,
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "http://192.168.0.31:8888",
+                    "pathRewrite" : {
+                        "^/api" : ""
+                    }
+                }
+            }
+        },
+        "title" : "RuoYi-App",
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        }
+    }
+}
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index b4c5c36..81b6425 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -8,7 +8,10 @@
 					<view class="col">层号：{{ warehouseInfo.layer }}</view>
 					<view class="col">货架：{{ warehouseInfo.shelf }}</view>
 				</view>
-				<view>当前录入总货物数：{{ quantityTotal }}</view>
+				<view class="row">
+					<span class="col">总货物数：{{ quantityTotal }}</span>
+					<span class="col">总箱数：{{ newMaterialList.length }}</span>
+				</view>
 				<view>
 					<view v-if="searchType === 1" class="color1 aciton-box">操作指示-请扫仓库码</view>
 					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
@@ -108,43 +111,18 @@ export default {
 			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
 			// 初始化，并且清空数据
 			this.clearData.warehouseInfo = JSON.parse(JSON.stringify(this.warehouseInfo));
-			// this.clearData.packageInfo = JSON.parse(JSON.stringify(this.packageInfo));
 			this.clearData.oldMaterialList = JSON.parse(JSON.stringify(this.oldMaterialList));
 			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
 			this.searchType = 1;
-
-			// for (let i = 1; i <= 10; i++) {
-			// 	this.oldMaterialList.push({
-			// 		packageCode: 'BNW240312023_18B1  35233201041  鲨鱼鳍  ' + i + '个',
-			// 		entryWarehouseTime: '2024/3/13'
-			// 	});
-			// }
-			// for (let i = 1; i <= 10; i++) {
-			// 	this.newMaterialList.push({
-			// 		// 工单号
-			// 		workoderID: '240305021',
-			// 		// 批次号(工单号+箱号+班组)
-			// 		patchCode: 'BNW240312023_' + i + 'B1',
-			// 		// 零件号
-			// 		partNumner: '0215.000.801-6SU',
-			// 		// 描述
-			// 		describe: 'D365支架-幻影黒-后右',
-			// 		// 出厂日期/生产日期
-			// 		productionTime: '20240315',
-			// 		// 此箱数量
-			// 		quantity: 10
-			// 	});
-			// }
 		},
 		clear() {
 			this.warehouseInfo = JSON.parse(JSON.stringify(this.clearData.warehouseInfo));
-			// this.packageInfo = JSON.parse(JSON.stringify(this.clearData.packageInfo));
 			this.oldMaterialList = JSON.parse(JSON.stringify(this.clearData.oldMaterialList));
 			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
 			this.searchType = 1;
 		},
 		handleGetInfo(data, type) {
-			console.log(data);
+			console.log(data, type);
 			if (type === 1) {
 				// 仓库扫完后是箱号
 				this.searchType = 2;
@@ -154,7 +132,7 @@ export default {
 				const checkData = {
 					originalCode: data.originalCode
 				};
-				const checkIs = WarehoseApi.isExistedWarehouse(checkData).then((res) => {
+				WarehoseApi.isExistedWarehouse(checkData).then((res) => {
 					if (res.code !== 200 || res.data) {
 						uni.showModal({
 							title: '提示',
@@ -166,14 +144,19 @@ export default {
 					}
 					// 此时扫描的是箱号
 					// 当前录入的箱号是否在同一批次录入过
-					if (this.newMaterialList.length > 0 && this.newMaterialList[this.newMaterialList.length - 1].patchCode === data.patchCode) {
-						uni.showModal({
-							title: '提示',
-							content: '当前批次下，货物已录入',
-							showCancel: false,
-							confirmText: '确定'
-						});
-						return;
+					// 曾经是否扫过
+					if(this.newMaterialList.length > 0){
+						for(let item of this.newMaterialList){
+							if (item.patchCode === data.patchCode) {
+								uni.showModal({
+									title: '提示',
+									content: '此货物已录入过',
+									showCancel: false,
+									confirmText: '确定'
+								});
+								return;
+							}
+						}
 					}
 					this.newMaterialList.push(data);
 				});
@@ -204,6 +187,15 @@ export default {
 		},
 		// 入库提交
 		handlerSubmit() {
+			if (this.newMaterialList.length === 0) {
+				uni.showModal({
+					title: '提示',
+					content: '无入库货物！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
 			uni.showModal({
 				title: '入库操作',
 				content: '是否确认入库?',
@@ -214,20 +206,18 @@ export default {
 					if (res.confirm) {
 						let list = [];
 						for (let item of this.newMaterialList) {
-							console.log(item);
 							list.push(item.originalCode);
 						}
 						const data = {
 							location: this.warehouseInfo.location,
 							packagelist: list
 						};
-						console.log(data);
 						WarehoseApi.handlerIntoProductWarehouse(data).then((res) => {
 							if (res.code === 200) {
 								if (!res.data) {
 									uni.showModal({
 										title: '提示',
-										content: res.msg,
+										content: '入库失败：' + res.msg,
 										showCancel: false,
 										confirmText: '确定'
 									});
@@ -309,8 +299,8 @@ export default {
 .scroll-view-box {
 	width: 94%;
 	margin: 0 auto;
-	margin-top: 20px;
-	height: 360px;
+	margin-top: 30px;
+	height: 400px;
 	padding: 10px;
 	background-color: rgba(20, 9, 69, 0.2);
 	border-radius: 5px;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2c8d08c..75d86fc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -154,6 +154,10 @@ export default {
 		handlerBaseUrlConfirm() {
 			const baseUrl = this.BaseUrl;
 			console.log('confirm', baseUrl);
+			uni.showToast({
+				title: '链接地址已修改：' + baseUrl,
+				icon: 'none'
+			});
 			setBaseUrl(baseUrl);
 		}
 	}
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index 213db50..98639b0 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -1,23 +1,314 @@
 <template>
 	<view class="content">
-		出库
+		<view class="title-box">
+			<!-- <span class="title-text">出库</span> -->
+			<view class="warehoseInfo-box">
+				<view>出库单号：{{ outInfo.shipmentNum }}</view>
+				<view class="row">
+					<view>备注：{{ outInfo.remarks }}</view>
+				</view>
+				<view class="row">
+					<span class="col">已扫货物数：{{ quantityTotal }}</span>
+					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
+				</view>
+				<view>
+					<view v-if="searchType === 3" class="color1 aciton-box">操作指示-请扫出货单</view>
+					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<!-- 扫描操作 -->
+					<view class="pda-search-box">
+						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 货物列表 -->
+		<view class="scroll-view-box">
+			<view class="scroll-view-title">出库清单</view>
+			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<button type="default" @click="handlerDoOut">货物出库</button>
+			<button type="default" @click="handlerSubmit">出库单完成</button>
+		</view>
 	</view>
 </template>
 
 <script>
-	// 出库
-	export default {
-		data() {
-			return {
-				
+import materialItem from '@/components/material-item/material-item.vue';
+import packageCard from '@/components/package-card/package-card.vue';
+import * as WarehoseApi from '@/api/warehouse/warehose.js';
+// 入库
+export default {
+	components: {
+		materialItem,
+		packageCard
+	},
+	data() {
+		return {
+			loading: false,
+			// 双击判定
+			touchNum: 0,
+			clearData: {},
+			// 出货单信息
+			outInfo: {
+				id: '',
+				// 出库单号
+				shipmentNum: '',
+				// 备注
+				remarks: '',
+				materialList: []
+			},
+			// 货物信息
+			lastPackageInfo: {
+				// 工单号
+				workoderID: '',
+				// 批次号(工单号+箱号+班组)
+				patchCode: '',
+				// 零件号
+				partNumner: '',
+				// 描述
+				productionDescribe: '',
+				// 出厂日期/生产日期
+				productionTime: '',
+				// 此箱数量
+				quantity: 0
+			},
+			// 新录入货物信息
+			newMaterialList: [],
+			// 1-仓库扫码 2-货物扫码 3-出货单扫码
+			searchType: 3
+		};
+	},
+	watch: {},
+	created() {
+		this.init();
+	},
+	computed: {
+		quantityTotal() {
+			let num = 0;
+			for (let index = 0; index < this.newMaterialList.length; index++) {
+				let _num = parseInt(this.newMaterialList[index].quantity);
+				_num = _num || 0;
+				num += _num * 1;
+			}
+			return num;
+		}
+	},
+	methods: {
+		init() {
+			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
+			// 初始化，并且清空数据
+			this.clearData.outInfo = JSON.parse(JSON.stringify(this.outInfo));
+			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
+			this.searchType = 3;
+		},
+		clear() {
+			this.outInfo = JSON.parse(JSON.stringify(this.clearData.outInfo));
+			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+			this.searchType = 3;
+		},
+		// 扫码信息录入
+		handleGetInfo(data, type) {
+			if (type === 3) {
+				// 出货单扫完后是扫箱号
+				this.searchType = 2;
+				this.outInfo = data;
+				this.newMaterialList = [];
+			} else if (type === 2) {
+				if (this.newMaterialList.length > 0) {
+					uni.showModal({
+						title: '提示',
+						content: '当前货物未确认出库，请先点击下方出库按钮，出库当前货物！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+
+				// 此时扫描的是箱号
+				// TODO 检查扫描的箱号零件号是否在此工单下
+				// TODO 箱出库，并关联到此出库单下
+				this.newMaterialList.push(data);
 			}
 		},
-		methods: {
-			
+		// 货物出库
+		handlerDoOut() {
+			if (this.searchType === 3) {
+				uni.showModal({
+					title: '提示',
+					content: '请先扫出库单！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			if (this.newMaterialList.length === 0) {
+				uni.showModal({
+					title: '提示',
+					content: '当前未扫描货物！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			uni.showModal({
+				title: '操作',
+				content: '是否确认执行出库操作?',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '确认出库',
+				success: (res) => {
+					if (res.confirm) {
+						const data = {
+							shipmentNum: this.outInfo.shipmentNum,
+							patchCode: [this.newMaterialList[0].patchCode]
+						};
+						console.log(data);
+						WarehoseApi.doMaterialOut(data).then(res=>{
+							if(res.code !== 200){
+								uni.showModal({
+									title: '提示',
+									content: '出库异常',
+									showCancel: false,
+									confirmText: '确认'
+								});
+								return;
+							}
+							uni.showModal({
+								title: '提示',
+								content: '出库成功',
+								showCancel: false,
+								confirmText: '确认'
+							});
+							this.newMaterialList = [];
+						})
+						
+					}
+				}
+			});
+		},
+		// 出库单完成
+		handlerSubmit() {
+			uni.showModal({
+				title: '操作',
+				content: '是否确认执行出库单完成操作?完成后将不可继续出库！',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '确认出库单完成',
+				success: (res) => {
+					if (res.confirm) {
+						//TODO 变更出库单状态
+						const data = {
+							shipmentNum: this.outInfo.shipmentNum
+						};
+						WarehoseApi.doOverOutorderplan(data).then(res=>{
+							if(res.code === 200){
+								uni.showModal({
+									title: '提示',
+									content: '此出库单已完成',
+									showCancel: false,
+									confirmText: '确认'
+								});
+								this.clear();
+							}else{
+								uni.showModal({
+									title: '提示',
+									content: '出库单完成异常！',
+									showCancel: false,
+									confirmText: '确认'
+								});
+							}
+						})
+						
+					}
+				}
+			});
 		}
 	}
+};
 </script>
 
-<style>
-
+<style scoped>
+.title-box {
+	margin-top: 54px;
+	margin-bottom: 20px;
+	height: 60px;
+	font-size: 26px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.warehoseInfo-box {
+	font-size: 20px;
+	width: 94%;
+	margin: 0 auto;
+	padding-left: 10px;
+	padding-right: 10px;
+	background-color: aliceblue;
+	border-radius: 10px;
+	display: flex;
+	flex-direction: column;
+}
+.warehoseInfo-box .row {
+	display: flex;
+	flex-direction: row;
+}
+.warehoseInfo-box .row .col {
+	width: 50%;
+}
+.aciton-box {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.color1 {
+	color: yellowgreen;
+}
+.color2 {
+	color: orange;
+}
+.pda-search-box {
+	margin-bottom: 5px;
+}
+.list-box {
+	width: 100%;
+}
+.scroll-view-title {
+	font-size: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.scroll-view-box {
+	width: 94%;
+	margin: 0 auto;
+	margin-top: 50px;
+	height: 360px;
+	padding: 10px;
+	background-color: rgba(20, 9, 69, 0.2);
+	border-radius: 5px;
+}
+.scroll-view-last {
+	width: 100%;
+	height: 60px;
+	font-size: 20px;
+	color: rgba(0, 9, 0, 0.7);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	margin-top: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+	border-radius: 10px;
+	background-color: white;
+}
+.button-box {
+	width: 80%;
+	margin: 10px auto;
+	display: flex;
+	flex-direction: row;
+}
 </style>
diff --git a/pages/relocation/relocation.vue b/pages/relocation/relocation.vue
index 2b10917..8231a2d 100644
--- a/pages/relocation/relocation.vue
+++ b/pages/relocation/relocation.vue
@@ -1,23 +1,310 @@
 <template>
 	<view class="content">
-		移库
+		<view class="title-box">
+			<!-- <span class="title-text">移库</span> -->
+			<view class="warehoseInfo-box">
+				<view>待移库仓库编号：{{ warehouseInfo.warehouse + ' ' + warehouseInfo.location }}</view>
+				<view class="row">
+					<view class="col">层号：{{ warehouseInfo.layer }}</view>
+					<view class="col">货架：{{ warehouseInfo.shelf }}</view>
+				</view>
+				<!-- <view class="row">
+					<span class="col">总货物数：{{ quantityTotal }}</span>
+					<span class="col">总箱数：{{ newMaterialList.length }}</span>
+				</view> -->
+				<view>
+					<view v-if="searchType === 1" class="color1 aciton-box">操作指示-请扫仓库码</view>
+					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<!-- 扫描操作 -->
+					<view class="pda-search-box">
+						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 货物列表 -->
+		<view class="scroll-view-box">
+			<view class="scroll-view-title">移库清单</view>
+			<view class="scroll-view-last" v-if="newMaterialList.length === 1">货物仓库地址：{{packageInfo.locationCode}}</view>
+			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<button type="default" @click="handlerSubmit">移库</button>
+		</view>
 	</view>
 </template>
 
 <script>
-	// 移库
-	export default {
-		data() {
-			return {
-				
+import materialItem from '@/components/material-item/material-item.vue';
+import packageCard from '@/components/package-card/package-card.vue';
+import * as WarehoseApi from '@/api/warehouse/warehose.js';
+import * as GoodsNowApi from '@/api/warehouse/wmGoodsNowProduction.js';
+// 移库
+export default {
+	components: {
+		materialItem,
+		packageCard
+	},
+	data() {
+		return {
+			loading: false,
+			// 双击判定
+			touchNum: 0,
+			clearData: {},
+			// 仓库信息
+			warehouseInfo: {
+				id: '',
+				warehouse: '',
+				warehouse_num: '',
+				location: '',
+				shelf: '',
+				layer: '',
+				number: 0
+			},
+			// 货物信息
+			packageInfo: {
+				// id
+				id:'',
+				// 工单号
+				workoderID: '',
+				// 批次号(工单号+箱号+班组)
+				patchCode: '',
+				// 零件号
+				partNumner: '',
+				// 仓库地址
+				locationCode:'',
+				// 标签数量
+				goodsNumLogic:0,
+				// 盘点数量（实际）
+				goodsNumAction:0,
+				// 描述
+				productionDescribe: '',
+				// 出厂日期/生产日期
+				productionTime: '',
+				// 此箱数量
+				quantity: 0
+			},
+			// 库位历史信息
+			oldMaterialList: [],
+			// 库位新录入货物信息
+			newMaterialList: [],
+			// 1-仓库扫码 2-货物扫码
+			searchType: 2
+		};
+	},
+	watch: {},
+	created() {
+		this.init();
+	},
+	computed: {
+		quantityTotal() {
+			let num = 0;
+			for (let index = 0; index < this.newMaterialList.length; index++) {
+				num += this.newMaterialList[index].quantity * 1;
+			}
+			return num;
+		}
+	},
+	methods: {
+		init() {
+			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
+			// 初始化，并且清空数据
+			this.clearData.warehouseInfo = JSON.parse(JSON.stringify(this.warehouseInfo));
+			this.clearData.oldMaterialList = JSON.parse(JSON.stringify(this.oldMaterialList));
+			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
+			this.searchType = 2;
+		},
+		clear() {
+			this.warehouseInfo = JSON.parse(JSON.stringify(this.clearData.warehouseInfo));
+			this.oldMaterialList = JSON.parse(JSON.stringify(this.clearData.oldMaterialList));
+			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+			this.searchType = 2;
+		},
+		// 移库操作
+		handleGetInfo(data, type) {
+			// 先扫箱号，再扫库位
+			if (type === 1) {
+				// this.searchType = 2;
+				this.warehouseInfo = data?.warehoseInfo;
+				// this.newMaterialList = [];
+			} else if (type === 2) {
+				// 1.先扫货物编码
+				this.warehouseInfo = JSON.parse(JSON.stringify(this.clearData.warehouseInfo));
+				const checkData = {
+					originalCode: data.originalCode
+				};
+				// 是否在库
+				WarehoseApi.isExistedWarehouse(checkData).then((res) => {
+					if (res.code !== 200 || !res.data) {
+						uni.showModal({
+							title: '提示',
+							content: '货物异常或未入库，不可移库！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+					if (this.newMaterialList.length > 1) {
+						uni.showModal({
+							title: '提示',
+							content: '仅支持一个货物移库!',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+					this.newMaterialList.push(data);
+					const searchInfoData = {
+						patchCode:data.patchCode
+					}
+					// 获取成品库内信息
+					WarehoseApi.getInfoByPatchCode(searchInfoData).then(res=>{
+						if(res.code === 200){
+							this.packageInfo = res.data;
+						}else{
+							uni.showModal({
+								title: '提示',
+								content: '货物数据异常',
+								showCancel: false,
+								confirmText: '确定'
+							});
+							return;
+						}
+					})
+					uni.showModal({
+						title: '提示',
+						content: '接下来请扫需要移动到的仓库编码！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					this.searchType = 1;
+				});
 			}
 		},
-		methods: {
-			
+		// 移库提交
+		handlerSubmit() {
+			if (this.newMaterialList.length === 0) {
+				uni.showModal({
+					title: '提示',
+					content: '无待移库货物！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
+			uni.showModal({
+				title: '操作',
+				content: '是否确认移动' + this.newMaterialList[0].patchCode + '至' + this.warehouseInfo.location + '仓库?',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '确认移库',
+				success: (res) => {
+					if (res.confirm) {
+						let data = {
+							id: this.packageInfo.id,
+							locationCode: this.warehouseInfo.location
+						};
+						GoodsNowApi.updateWmGoodsNowProduction(data).then((res) => {
+							if (res.code === 200) {
+								uni.showToast({
+									icon: 'success',
+									title: '移库成功！'
+								});
+								this.clear();
+							} else {
+								uni.showToast({
+									icon: 'error',
+									title: '移库失败！'
+								});
+							}
+						});
+					}
+				}
+			});
 		}
 	}
+};
 </script>
 
-<style>
-
+<style scoped>
+.title-box {
+	margin-top: 54px;
+	margin-bottom: 20px;
+	height: 60px;
+	font-size: 26px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.warehoseInfo-box {
+	font-size: 20px;
+	width: 94%;
+	margin: 0 auto;
+	padding-left: 10px;
+	padding-right: 10px;
+	background-color: aliceblue;
+	border-radius: 10px;
+	display: flex;
+	flex-direction: column;
+}
+.warehoseInfo-box .row {
+	display: flex;
+	flex-direction: row;
+}
+.warehoseInfo-box .row .col {
+	width: 50%;
+}
+.aciton-box {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.color1 {
+	color: brown;
+}
+.color2 {
+	color: orange;
+}
+.pda-search-box {
+	margin-bottom: 5px;
+}
+.list-box {
+	width: 100%;
+}
+.scroll-view-title {
+	font-size: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.scroll-view-box {
+	width: 94%;
+	margin: 0 auto;
+	margin-top: 30px;
+	height: 400px;
+	padding: 10px;
+	background-color: rgba(20, 9, 69, 0.2);
+	border-radius: 5px;
+}
+.scroll-view-last {
+	width: 100%;
+	height: 60px;
+	font-size: 20px;
+	color: rgba(0, 9, 0, 0.7);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	margin-top: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+	border-radius: 10px;
+	background-color: white;
+}
+.button-box {
+	width: 80%;
+	margin: 10px auto;
+}
 </style>
diff --git a/pages/returnWarehose/returnWarehose.vue b/pages/returnWarehose/returnWarehose.vue
index 989082e..c0e2efa 100644
--- a/pages/returnWarehose/returnWarehose.vue
+++ b/pages/returnWarehose/returnWarehose.vue
@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
 		<view class="title-box">
-			<!-- <span class="title-text">入库</span> -->
+			<!-- <span class="title-text">退库</span> -->
 			<view class="warehoseInfo-box">
-				<view>仓库编号：{{ warehouseInfo.warehouse + ' ' + warehouseInfo.location }}</view>
+				<!-- <view>仓库编号：{{ warehouseInfo.warehouse + ' ' + warehouseInfo.location }}</view>
 				<view class="row">
 					<view class="col">层号：{{ warehouseInfo.layer }}</view>
 					<view class="col">货架：{{ warehouseInfo.shelf }}</view>
 				</view>
-				<view>当前录入总货物数：{{ quantityTotal }}</view>
+				<view>当前录入总货物数：{{ quantityTotal }}</view> -->
 				<view>
-					<view v-if="searchType === 1" class="color1 aciton-box">操作指示-请扫仓库码</view>
-					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<!-- <view v-if="searchType === 1" class="color1 aciton-box">操作指示-请扫仓库码</view> -->
+					<view v-if="searchType === 4" class="color2 aciton-box">退库操作指示-请扫货物码</view>
 					<!-- 扫描操作 -->
 					<view class="pda-search-box">
 						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
@@ -26,7 +26,7 @@
 		</view>
 		<!-- 底部按钮 -->
 		<view class="button-box">
-			<button type="default" @click="handlerSubmit">入库</button>
+			<button type="default" @click="handlerSubmit">退库</button>
 		</view>
 	</view>
 </template>
@@ -76,8 +76,8 @@ export default {
 			oldMaterialList: [],
 			// 库位新录入货物信息
 			newMaterialList: [],
-			// 1-仓库扫码 2-货物扫码
-			searchType: 1
+			// 4-退库扫码
+			searchType: 4
 		};
 	},
 	watch: {},
@@ -100,82 +100,67 @@ export default {
 			this.clearData.warehouseInfo = JSON.parse(JSON.stringify(this.warehouseInfo));
 			this.clearData.oldMaterialList = JSON.parse(JSON.stringify(this.oldMaterialList));
 			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
-			this.searchType = 1;
+			this.searchType = 4;
 		},
 		clear() {
 			this.warehouseInfo = JSON.parse(JSON.stringify(this.clearData.warehouseInfo));
 			this.oldMaterialList = JSON.parse(JSON.stringify(this.clearData.oldMaterialList));
 			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
-			this.searchType = 1;
+			this.searchType = 4;
 		},
 		handleGetInfo(data, type) {
-			if (type === 1) {
-				// 仓库扫完后是箱号
-				this.searchType = 2;
-				this.warehouseInfo = data?.warehoseInfo;
-				this.newMaterialList = [];
-			} else if (type === 2) {
+			if (type === 4) {
 				// 此时扫描的是箱号
 				// 当前录入的箱号是否在同一批次录入过
-				if (this.newMaterialList.length > 0) {
-					uni.showModal({
-						title: '提示',
-						content: '退库只可退一个货物！',
-						showCancel: false,
-						confirmText: '确定'
-					});
-					return;
-				}
-				this.newMaterialList.push(data);
+				const checkData = {
+					originalCode: data.originalCode
+				};
+				WarehoseApi.isExistedWarehouse(checkData).then((res) => {
+					if (this.newMaterialList.length > 0) {
+						uni.showModal({
+							title: '提示',
+							content: '退库只可退一个货物！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+					this.newMaterialList.push(data);
+				});
 			}
 		},
-
-		// 长按弹出删除
-		handleDeleteItem(item, index) {
-			// 双击判定
-			this.touchNum++;
-			setTimeout(() => {
-				if (this.touchNum >= 2) {
-					uni.showModal({
-						title: '删除提示',
-						content: '是否从列表中删除此货物?',
-						showCancel: true,
-						cancelText: '取消',
-						confirmText: '删除',
-						success: (res) => {
-							if (res.confirm) {
-								this.newMaterialList.splice(index, 1);
-							}
-						}
-					});
-				}
-				this.touchNum = 0;
-			}, 250);
-		},
 		// 退库提交
 		handlerSubmit() {
+			if (this.newMaterialList.length === 0) {
+				uni.showModal({
+					title: '提示',
+					content: '无退库货物！',
+					showCancel: false,
+					confirmText: '确定'
+				});
+				return;
+			}
 			uni.showModal({
-				title: '入库操作',
-				content: '是否确认入库?',
+				title: '退库操作',
+				content: '是否确认执行退库操作?',
 				showCancel: true,
 				cancelText: '取消',
-				confirmText: '确认入库',
+				confirmText: '确认退库',
 				success: (res) => {
 					if (res.confirm) {
 						let list = [];
-						for (item in this.newMaterialList) {
-							list.push(item.patchCode);
+						for (let item of this.newMaterialList) {
+							list.push(item.originalCode);
 						}
 						const data = {
-							location: this.warehouseInfo.location,
-							packagelist: list
+							originalCode: list[0]
 						};
-						WarehoseApi.handlerIntoProductWarehouse(data).then((res) => {
+						WarehoseApi.handlErexitwarehouse(data).then((res) => {
 							if (res.code === 200) {
 								if (!res.data) {
 									uni.showModal({
 										title: '提示',
-										content: res.msg,
+										content: '退库异常：' + res.msg,
 										showCancel: false,
 										confirmText: '确定'
 									});
@@ -183,13 +168,13 @@ export default {
 								}
 								uni.showToast({
 									icon: 'success',
-									title: '入库成功！'
+									title: '退库成功！'
 								});
 								this.clear();
 							} else {
 								uni.showToast({
 									icon: 'error',
-									title: '入库失败！'
+									title: '退库失败！'
 								});
 							}
 						});
diff --git a/pages/stocktake/stocktake.vue b/pages/stocktake/stocktake.vue
index db320f8..a0cd1df 100644
--- a/pages/stocktake/stocktake.vue
+++ b/pages/stocktake/stocktake.vue
@@ -1,23 +1,287 @@
 <template>
 	<view class="content">
-		盘点
+		<view class="title-box">
+			<!-- <span class="title-text">盘点</span> -->
+			<view class="warehoseInfo-box">
+				<view class="row">
+					<span class="col">标签数量：</span>
+					<span class="col">{{ packageInfo.goodsNumLogic }}</span>
+				</view>
+				<view class="row">
+					<span class="col">实际数量：</span>
+					<span class="col"><input class="changeInput" type="number" v-model="packageInfo.goodsNumAction" /></span>
+				</view>
+				<!-- <view class="row">
+					<span class="col">已扫货物数：{{ quantityTotal }}</span>
+					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
+				</view> -->
+				<view>
+					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<!-- 扫描操作 -->
+					<view class="pda-search-box">
+						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 货物列表 -->
+		<view class="scroll-view-box">
+			<view class="scroll-view-title">盘点清单</view>
+			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard>
+		</view>
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<button type="default" @click="clear">清空</button>
+			<button type="default" @click="handlerSubmit">盘点</button>
+		</view>
 	</view>
 </template>
 
 <script>
-	// 盘点
-	export default {
-		data() {
-			return {
-				
+import materialItem from '@/components/material-item/material-item.vue';
+import packageCard from '@/components/package-card/package-card.vue';
+import * as WarehoseApi from '@/api/warehouse/warehose.js';
+import * as GoodsNowApi from '@/api/warehouse/wmGoodsNowProduction.js';
+// 盘点
+export default {
+	components: {
+		materialItem,
+		packageCard
+	},
+	data() {
+		return {
+			loading: false,
+			// 双击判定
+			touchNum: 0,
+			clearData: {},
+			// 货物信息
+			packageInfo: {
+				// id
+				id: '',
+				// 工单号
+				workoderID: '',
+				// 批次号(工单号+箱号+班组)
+				patchCode: '',
+				// 零件号
+				partNumner: '',
+				// 标签数量
+				goodsNumLogic: 0,
+				// 盘点数量（实际）
+				goodsNumAction: 0,
+				// 描述
+				productionDescribe: '',
+				// 出厂日期/生产日期
+				productionTime: '',
+				// 此箱数量
+				quantity: 0
+			},
+			// 新录入货物信息
+			newMaterialList: [],
+			// 1-仓库扫码 2-货物扫码 3-出货单扫码
+			searchType: 2
+		};
+	},
+	watch: {},
+	created() {
+		this.init();
+	},
+	computed: {
+		quantityTotal() {
+			let num = 0;
+			for (let index = 0; index < this.newMaterialList.length; index++) {
+				let _num = parseInt(this.newMaterialList[index].quantity);
+				_num = _num || 0;
+				num += _num * 1;
+			}
+			return num;
+		}
+	},
+	methods: {
+		init() {
+			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
+			// 初始化，并且清空数据
+			this.clearData.packageInfo = JSON.parse(JSON.stringify(this.packageInfo));
+			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
+			this.searchType = 2;
+		},
+		clear() {
+			this.packageInfo = JSON.parse(JSON.stringify(this.clearData.packageInfo));
+			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+			this.searchType = 2;
+		},
+		// 扫码信息录入
+		handleGetInfo(data, type) {
+			if (type === 2) {
+				// 此时扫描的是箱号
+				if (this.newMaterialList.length > 1) {
+					uni.showModal({
+						title: '提示',
+						content: '盘点仅支持单个货物盘点',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				const checkData = {
+					originalCode: data.originalCode
+				};
+				// 是否在库
+				WarehoseApi.isExistedWarehouse(checkData).then((res) => {
+					if (res.code !== 200 || !res.data) {
+						uni.showModal({
+							title: '提示',
+							content: '货物异常或未入库！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+
+					this.newMaterialList.push(data);
+					const searchInfoData = {
+						patchCode: data.patchCode
+					};
+					// 获取成品库内信息
+					WarehoseApi.getInfoByPatchCode(searchInfoData).then((res) => {
+						if (res.code === 200) {
+							this.packageInfo = res.data;
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: '货物数据异常',
+								showCancel: false,
+								confirmText: '确定'
+							});
+							return;
+						}
+					});
+				});
 			}
 		},
-		methods: {
-			
+		// 点击盘点
+		handlerSubmit() {
+			uni.showModal({
+				title: '操作',
+				content: '是否确认此修改',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '盘点完成',
+				success: (res) => {
+					if (res.confirm) {
+						//TODO 修改实际库存
+						let data = {
+							id: this.packageInfo.id,
+							goodsNumAction: this.packageInfo.goodsNumAction
+						};
+						GoodsNowApi.updateWmGoodsNowProduction(data).then((res) => {
+							if (res.code === 200) {
+								uni.showModal({
+									title: '提示',
+									content: '盘点已完成',
+									showCancel: false,
+									confirmText: '确认'
+								});
+								this.clear();
+							} else {
+								uni.showToast({
+									icon: 'error',
+									title: '盘点失败！'
+								});
+							}
+						});
+					}
+				}
+			});
 		}
 	}
+};
 </script>
 
-<style>
-
+<style scoped>
+.title-box {
+	margin-top: 54px;
+	margin-bottom: 20px;
+	height: 60px;
+	font-size: 26px;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.warehoseInfo-box {
+	font-size: 20px;
+	width: 94%;
+	margin: 0 auto;
+	padding-left: 10px;
+	padding-right: 10px;
+	background-color: aliceblue;
+	border-radius: 10px;
+	display: flex;
+	flex-direction: column;
+}
+.warehoseInfo-box .row {
+	display: flex;
+	flex-direction: row;
+}
+.warehoseInfo-box .row .col {
+	width: 50%;
+}
+.aciton-box {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.color1 {
+	color: yellowgreen;
+}
+.color2 {
+	color: orange;
+}
+.pda-search-box {
+	margin-bottom: 5px;
+}
+.list-box {
+	width: 100%;
+}
+.scroll-view-title {
+	font-size: 24px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.scroll-view-box {
+	width: 94%;
+	margin: 0 auto;
+	margin-top: 50px;
+	height: 360px;
+	padding: 10px;
+	background-color: rgba(20, 9, 69, 0.2);
+	border-radius: 5px;
+}
+.scroll-view-last {
+	width: 100%;
+	height: 60px;
+	font-size: 20px;
+	color: rgba(0, 9, 0, 0.7);
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	margin-top: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+	border-radius: 10px;
+	background-color: white;
+}
+.button-box {
+	width: 80%;
+	margin: 10px auto;
+	display: flex;
+	flex-direction: row;
+}
+.changeInput {
+	font-size: 20px;
+	background-color: gainsboro;
+	border:1px solid grey;
+}
 </style>
diff --git a/permission.js b/permission.js
index 24cf416..55d544c 100644
--- a/permission.js
+++ b/permission.js
@@ -22,11 +22,11 @@ list.forEach(item => {
 	uni.addInterceptor(item, {
 		invoke(to) {
 			if (getToken()) {
-				if (to.url === loginPage) {
-					uni.reLaunch({
-						url: loginPage
-					})
-				}
+				// if (to.url === loginPage) {
+				// 	uni.reLaunch({
+				// 		url: loginPage
+				// 	})
+				// }
 				return true
 			} else {
 				if (checkWhite(to.url)) {
diff --git a/utils/request.js b/utils/request.js
index ef427ce..86a96e6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -17,7 +17,10 @@ import {
 
 let timeout = 10000
 const request = config => {
+	// 浏览器测试用
 	const storageBaseUrl = 'http://' + getBaseUrl() + '/api';
+	// 真机测试以及部署用
+	// const storageBaseUrl = 'http://' + getBaseUrl();
 	// 是否需要设置 token
 	const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}
@@ -41,7 +44,8 @@ const request = config => {
 				dataType: 'json'
 			}).then(response => {
 				let [error, res] = response
-				console.log(response);
+				// console.log('token:','Bearer ' + getToken());
+				// console.log('request:',storageBaseUrl + config.url,response);
 				if (error) {
 					toast('后端接口连接异常')
 					reject('后端接口连接异常')