From 22c67fd681856d2b6513d02329b63d76017e1120 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 03 十一月 2023 18:05:05 +0800
Subject: [PATCH] 库位导入数据

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java |   39 ++++++++++++++++-----------------------
 1 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
index d5acd62..478892e 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
@@ -1,8 +1,6 @@
 package com.chinaztt.mes.basic.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.Unique;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -10,31 +8,26 @@
  */
 @Data
 public class LocationData {
-	/**
-	 * 搴撲綅缂栧彿
-	 */
+
+	@ExcelProperty("宸ュ巶")
+	private String factoryName;
+
 	@ExcelProperty("搴撲綅缂栧彿")
 	private String locNo;
-	/**
-	 * 搴撲綅鍚嶇О
-	 */
+
 	@ExcelProperty("搴撲綅鍚嶇О")
 	private String locName;
-	/**
-	 * 浠撳簱鍚嶇О
-	 */
-	@ExcelProperty("浠撳簱鍚嶇О")
-	private String warehouseName;
-	/**
-	 * 浠撳簱鍚嶇О
-	 */
-	@ExcelProperty("宸ュ巶id")
-	private Long factoryId;
-	/**
-	 * 浠撳簱鍚嶇О
-	 */
-	@ExcelProperty("宸ュ巶鍒嗙粍")
-	private Long locGroup;
 
+	@ExcelProperty("搴撲綅绫诲瀷锛堢嚎杈逛粨锛涗骇鍑哄悎鏍煎簱浣嶏紱浜у嚭寰呮搴撲綅锛涗笉鍚堟牸搴撲綅锛涘緟澶勭悊搴撲綅锛涙満鍙板簱锛�")
+	private String locType;
+
+	@ExcelProperty("鎵�灞炰粨搴�")
+	private String warehouseName;
+
+	@ExcelProperty("IFS搴撲綅")
+	private String ifsLocation;
+
+	@ExcelProperty("浠撳簱鐘舵��")
+	private String locState;
 
 }

--
Gitblit v1.9.3