更新

.env.dev

@@ -2,7 +2,7 @@
  # @Author: zwq
  # @Date: 2023-08-17 15:10:53
  # @LastEditors: zwq
- # @LastEditTime: 2023-10-25 13:59:56
+ # @LastEditTime: 2023-11-02 10:02:06
  # @Description:
 ###
 # 开发环境配置
@@ -12,8 +12,9 @@ ENV = 'development'
 VUE_APP_TITLE = 南京锂膜管理系统
 
 # 南京锂膜管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.23:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.23:48080'
-# VUE_APP_BASE_API = 'http://192.168.0.31:48081'
+VUE_APP_BASE_API = 'http://192.168.0.31:48081'
+# VUE_APP_BASE_API = 'http://192.168.1.26:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -1,3 +1,10 @@
+###
+ # @Author: zwq
+ # @Date: 2023-08-17 15:10:53
+ # @LastEditors: zwq
+ # @LastEditTime: 2023-11-02 11:20:37
+ # @Description:
+###
 # 生产环境配置
 ENV = 'production'
 

src/api/asrs/warehouseStorehouse.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-22 15:31:37
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-20 15:16:19
+ * @LastEditTime: 2023-10-31 09:48:35
  * @Description:
  */
 import request from '@/utils/request'
@@ -32,6 +32,14 @@ export function inWarehouseStorehouse(data) {
     data: data
   })
 }
+// 手动出库
+export function outWarehouseStorehouse(data) {
+  return request({
+    url: '/asrs/warehouse-storehouse/out',
+    method: 'post',
+    data: data
+  })
+}
 // 删除立库库位
 export function deleteWarehouseStorehouse(id) {
   return request({

src/components/Verifition/Verify/VerifyPoints.vue

@@ -151,7 +151,7 @@ export default {
       this.fontPos.splice(0, this.fontPos.length)
       this.checkPosArr.splice(0, this.checkPosArr.length)
       this.num = 1
-      this.getPictrue()
+      //this.getPictrue()
       this.$nextTick(() => {
         this.setSize = this.resetSize(this)	// 重新设置宽度高度
         this.$parent.$emit('ready', this)
@@ -222,7 +222,7 @@ export default {
       this.fontPos.splice(0, this.fontPos.length)
       this.checkPosArr.splice(0, this.checkPosArr.length)
       this.num = 1
-      this.getPictrue()
+      //this.getPictrue()
       this.showRefresh = true
     },
 

src/components/Verifition/Verify/VerifySlide.vue

@@ -184,7 +184,7 @@ export default {
   methods: {
     init() {
       this.text = this.explain
-      this.getPictrue()
+      //this.getPictrue()
       this.$nextTick(() => {
         const setSize = this.resetSize(this)	// 重新设置宽度高度
         for (const key in setSize) {
@@ -344,7 +344,7 @@ export default {
       this.iconClass = 'icon-right'
       this.isEnd = false
 
-      this.getPictrue()
+      //this.getPictrue()
       setTimeout(() => {
         this.transitionWidth = ''
         this.transitionLeft = ''

src/views/asrs/inventoryOverview/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-22 15:01:54
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-13 14:30:24
+ * @LastEditTime: 2023-10-31 11:20:46
  * @Description:
 -->
 <template>
@@ -18,7 +18,12 @@
 					ref="barChart"
 					height="500px"
 					title="库存总览"
+					v-if="allData"
 					:all-data="allData" />
+				<el-empty
+					v-else
+					:image-size="300"
+					:image="require('../../../assets/images/empty.png')" />
 			</div>
 		</el-col>
 	</el-row>

src/views/asrs/inventoryOverview/indexb.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-22 15:01:54
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-13 14:32:40
+ * @LastEditTime: 2023-10-31 11:22:35
  * @Description:
 -->
 <template>
@@ -18,7 +18,12 @@
 					ref="barChart"
 					height="500px"
 					title="库存总览"
+					v-if="allData"
 					:all-data="allData" />
+				<el-empty
+					v-else
+					:image-size="300"
+					:image="require('../../../assets/images/empty.png')" />
 			</div>
 		</el-col>
 	</el-row>

src/views/asrs/jobMainTask/index.vue

@@ -82,21 +82,17 @@ const tableProps = [
 ];
 const mainTaskType = [
 	{
-		name: '一次分切',
+		name: '入库',
 		id: 1,
 	},
 	{
-		name: '二次分切',
+		name: '出库',
 		id: 2,
 	},
 	{
-		name: '一次分拣',
+		name: '移库',
 		id: 3,
 	},
-	{
-		name: '二次分拣',
-		id: 4,
-	},
 ];
 const mainTaskState = [
 	{
@@ -119,10 +115,10 @@ const mainTaskState = [
 		name: '堆垛机运行中',
 		id: 4,
 	},
-	{
+	// {
-		name: '完成',
+	// 	name: '完成',
-		id: 5,
+	// 	id: 5,
-	},
+	// },
 ];
 const agvArr = [
 	{

src/views/asrs/jobMainTaskHistory/index.vue

@@ -81,21 +81,17 @@ const tableProps = [
 ];
 const mainTaskType = [
 	{
-		name: '一次分切',
+		name: '入库',
 		id: 1,
 	},
 	{
-		name: '二次分切',
+		name: '出库',
 		id: 2,
 	},
 	{
-		name: '一次分拣',
+		name: '移库',
 		id: 3,
 	},
-	{
-		name: '二次分拣',
-		id: 4,
-	},
 ];
 const mainTaskState = [
 	{
@@ -175,14 +171,14 @@ export default {
 					defaultSelect: '',
 					filterable: true,
 				},
-				{
+				// {
-					type: 'select',
+				// 	type: 'select',
-					label: '状态',
+				// 	label: '状态',
-					selectOptions: mainTaskState,
+				// 	selectOptions: mainTaskState,
-					param: 'status',
+				// 	param: 'status',
-					defaultSelect: '',
+				// 	defaultSelect: '',
-					filterable: true,
+				// 	filterable: true,
-				},
+				// },
 				{
 					type: 'select',
 					label: '堆垛机',
@@ -225,7 +221,9 @@ export default {
 		};
 	},
 	components: {},
-	created() {},
+	created() {
+    this.listQuery.mainTaskState = 5;
+  },
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -234,7 +232,8 @@ export default {
 					this.listQuery.pageSize = 10;
 					this.listQuery.mainTaskCode = val.code;
 					this.listQuery.mainTaskType = val.taskType;
-					this.listQuery.mainTaskState = val.status;
+					// this.listQuery.mainTaskState = val.status;
+					this.listQuery.mainTaskState = 5;
 					this.listQuery.stacker = val.stacker;
 					this.listQuery.agv = val.agv;
 					this.listQuery.createTime = val.searchTime;
@@ -248,6 +247,7 @@ export default {
 						pageSize: 10,
 						pageNo: 1,
 						total: 1,
+            mainTaskState : 5
 					};
 					this.getDataList();
 					break;

src/views/asrs/mixins/code-filter.js

@@ -2,7 +2,7 @@
 /*
  * @Date: 2020-12-29 16:49:28
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-07 14:32:52
+ * @LastEditTime: 2023-10-30 15:05:30
  * @FilePath: \basic-admin\src\filters\basicData\index.js
  * @Description:
  */
@@ -26,10 +26,9 @@ const table = {
     0: 'A',
   },
   mainTaskType:{
-		1: '一次分切',
+		1: '入库',
-		2: '二次分切',
+		2: '出库',
-		3: '一次分拣',
+		3: '移库',
-		4: '二次分拣',
 	},
   mainTaskState:{
 		0: '开始',

src/views/asrs/warehouseLocationMonitoring/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-21 14:26:23
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-20 16:21:39
+ * @LastEditTime: 2023-10-30 15:08:26
  * @Description:
 -->
 <template>
@@ -122,12 +122,12 @@ export default {
 			formConfig: [
 				{
 					type: 'select',
-					label: '选择堆垛机',
+					label: '选择巷道',
 					selectOptions: [
-						{ id: 1, name: '一号堆垛机' },
+						{ id: 1, name: '巷道一' },
-						{ id: 2, name: '二号堆垛机' },
+						{ id: 2, name: '巷道二' },
-						{ id: 3, name: '三号堆垛机' },
+						{ id: 3, name: '巷道三' },
-						{ id: 4, name: '四号堆垛机' },
+						{ id: 4, name: '巷道四' },
 					],
 					param: 'stacker',
 					filterable: true,

src/views/asrs/warehouseLocationMonitoring/indexb.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-21 14:26:23
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-20 16:23:13
+ * @LastEditTime: 2023-10-30 15:08:33
  * @Description:
 -->
 <template>
@@ -122,12 +122,12 @@ export default {
 			formConfig: [
 				{
 					type: 'select',
-					label: '选择堆垛机',
+					label: '选择巷道',
 					selectOptions: [
-						{ id: 1, name: '一号堆垛机' },
+						{ id: 1, name: '巷道一' },
-						{ id: 2, name: '二号堆垛机' },
+						{ id: 2, name: '巷道二' },
-						{ id: 3, name: '三号堆垛机' },
+						{ id: 3, name: '巷道三' },
-						{ id: 4, name: '四号堆垛机' },
+						{ id: 4, name: '巷道四' },
 					],
 					param: 'stacker',
 					filterable: true,

src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue

@@ -58,6 +58,7 @@
 					<el-button
 						size="mini"
 						type="text"
+            :disabled="scope.row.warehouseStorehouseState===1"
 						@click="handleClick({ data: {id:scope.row}, type: 'edit' })"
 						v-hasPermi="[
 							'asrs:warehouse-storehouse-goods-specification:update',

src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue

@@ -45,9 +45,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item
+							<el-form-item label="选择起点位置" prop="startInfo">
-								label="选择起点位置"
-								prop="startInfo">
 								<el-select
 									v-model="dataForm.startInfo"
 									style="width: 100%"
@@ -57,7 +55,9 @@
 										v-for="item in potArr"
 										:key="item.id"
 										:label="item.lineEdgeLibraryCode"
-										:value="item.lineEdgeLibraryCode+'-'+item.agvGroundCode" />
+										:value="
+											item.lineEdgeLibraryCode + '-' + item.agvGroundCode
+										" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -256,7 +256,7 @@ export default {
 			this.dataForm.warehouseStorehouseCode = val.warehouseStorehouseCode;
 			this.dataForm.process = val.process;
 			this.dataForm.trayCode = val.trayCode;
-      this.dataForm.startInfo = ''
+			this.dataForm.startInfo = '';
 			this.initData();
 			this.visible = true;
 			getLineList().then((response) => {
@@ -326,31 +326,37 @@ export default {
 		},
 		// 表单提交
 		dataFormSubmit() {
+			let tableValid = false;
 			this.productAttributeList.forEach((item) => {
 				item.id = '';
 				item.warehouseStorehouseId = this.dataForm.id;
 				item.warehouseId = '';
-			});
+				if (!item.number) {
-			this.updata.process = this.dataForm.process;
+					tableValid = true;
-			this.updata.trayCode = this.dataForm.trayCode;
-			this.updata.lineEdgeLibraryCode =
-				this.dataForm.startInfo.split('-')[0];
-			this.updata.agvGroundCode =
-				this.dataForm.startInfo.split('-')[1];
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					this.updata.list = this.productAttributeList;
-					if (this.dataForm.id) {
-						inWarehouseStorehouse(this.updata).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.visible = false;
-							this.$emit('refreshDataList');
-						});
-						return;
-					}
 				}
 			});
+			if (!tableValid) {
+				this.updata.process = this.dataForm.process;
+				this.updata.trayCode = this.dataForm.trayCode;
+				this.updata.lineEdgeLibraryCode = this.dataForm.startInfo.split('-')[0];
+				this.updata.agvGroundCode = this.dataForm.startInfo.split('-')[1];
+				this.$refs['dataForm'].validate((valid) => {
+					if (valid) {
+						// 修改的提交
+						this.updata.list = this.productAttributeList;
+						if (this.dataForm.id) {
+							inWarehouseStorehouse(this.updata).then((response) => {
+								this.$modal.msgSuccess('修改成功');
+								this.visible = false;
+								this.$emit('refreshDataList');
+							});
+							return;
+						}
+					}
+				});
+			} else {
+				this.$modal.msgWarning('产品信息的数量为必填数据！');
+			}
 		},
 		// 新增 / 修改
 		addNew(index) {

src/views/asrs/warehouseStorehouseStorage/out-or-move.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-20 15:36:19
+ * @LastEditTime: 2023-11-02 11:15:57
  * @Description:
 -->
 <template>
@@ -34,8 +34,11 @@ import basicAdd from '../mixins/basic-add';
 import {
 	getWarehouseStorehouseList,
 	moveStorehouse,
+	outWarehouseStorehouse,
 	getLineList,
+	getWarehouseStorehouse,
 } from '@/api/asrs/warehouseStorehouse';
+import { getWarehouseStorehouseGoodsSpecificationPage } from '@/api/asrs/warehouseStorehouseGoodsSpecification';
 
 export default {
 	mixins: [basicAdd],
@@ -46,6 +49,9 @@ export default {
 				sourceId: undefined,
 				targetId: undefined,
 			},
+			wareInfo: {
+        list:[]
+      },
 			potArr: [],
 			type: 0,
 			dataRule: {
@@ -56,14 +62,14 @@ export default {
 		};
 	},
 	methods: {
-		init(id, type,wId) {
+		init(id, type, wId) {
 			this.dataForm.sourceId = id || '';
 			this.type = type;
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.type) {
-					getWarehouseStorehouseList({warehouseId:wId}).then((response) => {
+					getWarehouseStorehouseList({ warehouseId: wId,warehouseStorehouseState:0 }).then((response) => {
 						this.potArr = response.data;
 					});
 					return;
@@ -71,6 +77,18 @@ export default {
 				getLineList().then((response) => {
 					this.potArr = response.data;
 				});
+				getWarehouseStorehouse(id).then((response) => {
+					this.wareInfo = response.data;
+				});
+				const par = {
+					pageSize: 100,
+					pageNo: 1,
+					total: 1,
+					warehouseStorehouseId: id,
+				};
+				getWarehouseStorehouseGoodsSpecificationPage(par).then((response) => {
+					this.wareInfo.list = response.data.list;
+				});
 			});
 		},
 		// 表单提交
@@ -82,13 +100,28 @@ export default {
 				if (this.type) {
 					moveStorehouse(this.dataForm.sourceId, this.dataForm.targetId).then(
 						(response) => {
-							this.$modal.msgSuccess('修改成功');
+							this.$modal.msgSuccess('移库成功');
 							this.visible = false;
 							this.$emit('refreshDataList');
 						}
 					);
 					return;
 				}
+				const pos = this.potArr.find((item) => {
+					return item.id === this.dataForm.targetId;
+				});
+				this.wareInfo.agvGroundCode = pos.agvGroundCode;
+				this.wareInfo.lineEdgeLibraryCode = pos.lineEdgeLibraryCode;
+				// const data = {
+				// 	id: this.dataForm.sourceId,
+				// 	agvGroundCode: position.agvGroundCode,
+				// 	lineEdgeLibraryCode: position.lineEdgeLibraryCode,
+				// };
+				outWarehouseStorehouse(this.wareInfo).then((response) => {
+					this.$modal.msgSuccess('出库成功');
+					this.visible = false;
+					this.$emit('refreshDataList');
+				});
 			});
 		},
 	},

src/views/asrs/warehouseStorehouseStorageHistory/index.vue

@@ -38,9 +38,9 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="createDate" label="出入库时间">
+			<el-table-column prop="createTime" label="出入库时间">
 				<template v-slot="scope">
-					<span>{{ parseTime(scope.row.createDate) }}</span>
+					<span>{{ parseTime(scope.row.createTime) }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column

src/views/asrs/warehouseStorehouseStorageHistory/indexb.vue

@@ -38,9 +38,9 @@
 					</span>
 				</template>
 			</el-table-column>
-			<el-table-column prop="createDate" label="出入库时间">
+			<el-table-column prop="createTime" label="出入库时间">
 				<template v-slot="scope">
-					<span>{{ parseTime(scope.row.createDate) }}</span>
+					<span>{{ parseTime(scope.row.createTime) }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column

src/views/fpw/finishInventoryOverview/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-22 15:01:54
  * @LastEditors: zwq
- * @LastEditTime: 2023-10-13 14:16:32
+ * @LastEditTime: 2023-10-31 11:22:52
  * @Description:
 -->
 <template>
@@ -18,7 +18,12 @@
 					ref="barChart"
 					height="500px"
 					title="库存总览"
+					v-if="allData"
 					:all-data="allData" />
+				<el-empty
+					v-else
+					:image-size="300"
+					:image="require('../../../assets/images/empty.png')" />
 			</div>
 		</el-col>
 	</el-row>