From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化, 分类,物品,分发单明细,采购单明细数据导入

---
 consum-base/src/main/java/com/consum/base/pojo/excel/ImportProcureOrderTemplate.java |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/ImportProcureOrderTemplate.java b/consum-base/src/main/java/com/consum/base/pojo/excel/ImportProcureOrderTemplate.java
index bb8e692..c6c559c 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/ImportProcureOrderTemplate.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/ImportProcureOrderTemplate.java
@@ -13,28 +13,33 @@
 @Data
 public class ImportProcureOrderTemplate {
 
-    @ExcelProperty("鍏ュ簱鏈烘瀯")
-    private String agencyName;
-    @ExcelProperty("鍏ュ簱浠撳簱")
-    private String warehouseName;
-    @ExcelProperty("閲囪喘绫诲瀷")
-    private String type;
-    @ExcelProperty("鐗╁搧涓�绾у垎绫�")
+    @ExcelProperty("涓�绾у垎绫�")
     private String categoryOne;
-    @ExcelProperty("鐗╁搧浜岀骇鍒嗙被")
+    @ExcelProperty("浜岀骇鍒嗙被")
     private String categoryTwo;
-    @ExcelProperty("鐗╁搧涓夌骇鍒嗙被")
+    @ExcelProperty("鍝佺被鍚嶇О")
     private String categoryThree;
-    @ExcelProperty("鐗╁搧鍚嶇О")
+    @ExcelProperty("绠$悊鍒嗙被")
+    private String type;
+    @ExcelProperty("鍝佸悕")
     private String goodsName;
     @ExcelProperty("瑙勬牸鍨嬪彿")
     private String goodModelName;
+    @ExcelProperty("鍗曚綅")
+    private String unit;
+    @ExcelProperty("鐗╁搧绫诲瀷")
+    private String goodsType;
+    @ExcelProperty("鎵�鍦ㄤ粨搴�")
+    private String warehouseName;
+//    @ExcelProperty("鍒涘缓鏈烘瀯")
+//    private String agencyName;
     @ExcelProperty("渚涜揣鍟�")
     private String supplierName;
-    @ExcelProperty("鏁伴噺鍗曚綅")
-    private String unit;
     @ExcelProperty("鍗曚环(鍏�)")
     private String price;
-    @ExcelProperty("鍏ュ簱鏁伴噺")
+    @ExcelProperty("搴撳瓨鏁伴噺")
     private String num;
+//    @ExcelProperty("搴撶鍛�")
+//    private String warehouseKeeper;
+
 }

--
Gitblit v1.9.1