From 000d8ff50a38cd3464ae81f6e7cabd11753a441d Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 18 八月 2021 16:14:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 5b97d69..66fa726 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -68,6 +68,11 @@
matCode.getMatNo(),
matCode.getBarcode(),
matCode.getMatName(),
+ matCode.getSpecs(),
+ matCode.getUnit(),
+ matCode.getSize(),
+ matCode.getColor(),
+ matCode.getWeight(),
matCode.getStr1(),
matCode.getStr2(),
matCode.getStr3(),
@@ -78,25 +83,11 @@
matCode.getStr8(),
matCode.getStr9(),
matCode.getStr10(),
- matCode.getStr11(),
- matCode.getStr12(),
- matCode.getStr13(),
- matCode.getStr14(),
- matCode.getStr15(),
- matCode.getStr16(),
- matCode.getStr17(),
- matCode.getStr18(),
- matCode.getStr19(),
- matCode.getStr20(),
- matCode.getStr21(),
- matCode.getStr22(),
- matCode.getStr23(),
matCode.getNum1(),
matCode.getNum2(),
matCode.getNum3(),
matCode.getNum4(),
- matCode.getNum5(),
- matCode.getNum6()
+ matCode.getNum5()
);
}
@@ -104,6 +95,11 @@
matCode.setMatNo(excel.getMatNo());
matCode.setMatName(excel.getMatName());
matCode.setBarcode(excel.getBarcode());
+ matCode.setSpecs(excel.getSpecs());
+ matCode.setUnit(excel.getUnit());
+ matCode.setSize(excel.getSize());
+ matCode.setColor(excel.getColor());
+ matCode.setWeight(excel.getWeight());
matCode.setStr1(excel.getStr1());
matCode.setStr2(excel.getStr2());
matCode.setStr3(excel.getStr3());
@@ -114,25 +110,11 @@
matCode.setStr8(excel.getStr8());
matCode.setStr9(excel.getStr9());
matCode.setStr10(excel.getStr10());
- matCode.setStr11(excel.getStr11());
- matCode.setStr12(excel.getStr12());
- matCode.setStr13(excel.getStr13());
- matCode.setStr14(excel.getStr14());
- matCode.setStr15(excel.getStr15());
- matCode.setStr16(excel.getStr16());
- matCode.setStr17(excel.getStr17());
- matCode.setStr18(excel.getStr18());
- matCode.setStr19(excel.getStr19());
- matCode.setStr20(excel.getStr20());
- matCode.setStr21(excel.getStr21());
- matCode.setStr22(excel.getStr22());
- matCode.setStr23(excel.getStr23());
matCode.setNum1(excel.getNum1());
matCode.setNum2(excel.getNum2());
matCode.setNum3(excel.getNum3());
matCode.setNum4(excel.getNum4());
matCode.setNum5(excel.getNum5());
- matCode.setNum6(excel.getNum6());
}
--
Gitblit v1.9.1