From f787d586e17b4cf52bf018d4253d0b9d47b6030b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 17 七月 2020 15:44:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 7
src/main/java/com/zy/asrs/utils/VersionUtils.java | 78 ++++++++
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 372 ++++++++++++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/entity/MatCode.java | 65 +++---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java | 11
src/main/resources/application.yml | 2
6 files changed, 466 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 1594efb..e2e4399 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -15,6 +15,7 @@
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
@@ -128,11 +129,7 @@
List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
- MatCodeExcel excel = new MatCodeExcel();
- excel.setMatNo(matCode.getMatNo());
- excel.setBarcode(matCode.getBarcode());
- excel.setMatName(matCode.getMatName());
- excel.setStr1(matCode.getStr1());
+ MatCodeExcel excel = VersionUtils.getExcel(matCode);
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 10d2feb..6f45a09 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -22,7 +22,7 @@
/**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "鍟嗗搧缂栫爜")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -30,104 +30,101 @@
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "鏉″舰鐮�")
private String barcode;
/**
* 鐗╂枡鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@TableField("mat_name")
private String matName;
/**
* 鐗╂枡鍗曚綅
*/
- @ApiModelProperty(value= "鐗╂枡鍗曚綅")
+ @ApiModelProperty(value= "鍩烘湰鍗曚綅")
private String str1;
- /**
- * 鐗╂枡瑙勬牸
- */
- @ApiModelProperty(value= "鐗╂枡瑙勬牸")
+ @ApiModelProperty(value= "鍟嗗搧绫诲埆")
private String str2;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "瑙勬牸鍨嬪彿")
private String str3;
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value= "鐘舵��")
private String str4;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍔╄鐮�")
private String str5;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "榛樿渚涘簲鍟�")
private String str6;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "榛樿浠撳簱")
private String str7;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍝佺墝")
private String str8;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "閲囪喘鍛�")
private String str9;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "浜у湴")
private String str10;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "搴忓垪鍙风鐞�")
private String str11;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鎵规绠＄悊")
private String str12;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "淇濊川鏈熷崟浣�")
private String str13;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "淇濊川鏈熺鐞�")
private String str14;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "淇濊川鏈�")
private String str15;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍙攢鍞�")
private String str16;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍙噰璐�")
private String str17;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍙负瀛愪欢")
private String str18;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍙负缁勪欢")
private String str19;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "杈呭姪灞炴�х鐞�")
private String str20;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鎴愭湰璁＄畻鏂规硶")
private String str21;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "閲囪喘鍗曚綅")
private String str22;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "閿�鍞崟浣�")
private String str23;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value= "棰勮澶╂暟")
private Double num1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
private Double num2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
private Double num3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨")
private Double num4;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "绋庣巼")
private Double num5;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 53c008e..aa623d0 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -3,11 +3,14 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
/**
* Created by vincent on 2020/7/14
*/
public class VersionUtils {
+
+ // 涓氬姟 ----------------------------------------------------------------------
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
@@ -36,4 +39,79 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
+ // excel ----------------------------------------------------------------------
+
+ public static MatCodeExcel getExcel(MatCode matCode) {
+ return new MatCodeExcel(
+ matCode.getMatNo(),
+ matCode.getBarcode(),
+ matCode.getMatName(),
+ matCode.getStr1(),
+ matCode.getStr2(),
+ matCode.getStr3(),
+ matCode.getStr4(),
+ matCode.getStr5(),
+ matCode.getStr6(),
+ matCode.getStr7(),
+ 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()
+ );
+ }
+
+ public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
+ matCode.setMatNo(excel.getMatNo());
+ matCode.setMatName(excel.getMatName());
+ matCode.setBarcode(excel.getBarcode());
+ matCode.setStr1(excel.getStr1());
+ matCode.setStr2(excel.getStr2());
+ matCode.setStr3(excel.getStr3());
+ matCode.setStr4(excel.getStr4());
+ matCode.setStr5(excel.getStr5());
+ matCode.setStr6(excel.getStr6());
+ matCode.setStr7(excel.getStr7());
+ 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());
+ }
+
+
}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index 124a34b..a5e2929 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -1,41 +1,146 @@
package com.zy.common.utils.excel.matcode;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
/**
- * Created by vincent on 2020/6/6
+ * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
+ * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
+ * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
*/
public class MatCodeExcel {
- /**
- * 鐗╂枡缂栫爜
- */
- @ColumnWidth(24)
- @ExcelProperty(value = "鐗╂枡缂栫爜", index = 0)
+ @ExcelProperty(value= "鍟嗗搧缂栫爜", index = 1)
private String matNo;
- /**
- * 鏉＄爜
- */
- @ColumnWidth(12)
- @ExcelProperty(value = "鏉＄爜", index = 1)
+ @ExcelProperty(value= "鏉″舰鐮�", index = 4)
private String barcode;
- /**
- * 鐗╂枡鍚嶇О
- */
- @ColumnWidth(36)
- @ExcelProperty(value = "鐗╂枡鍚嶇О", index = 2)
+ @ExcelProperty(value= "鍟嗗搧鍚嶇О", index = 2)
private String matName;
- /**
- * 鐗╂枡鍗曚綅
- */
- @ColumnWidth(10)
- @ExcelProperty(value = "鐗╂枡鍗曚綅", index = 3)
+ @ExcelProperty(value= "鍩烘湰鍗曚綅", index = 8)
private String str1;
+ @ExcelProperty(value= "鍟嗗搧绫诲埆", index = 3)
+ private String str2;
+
+ @ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
+ private String str3;
+
+ @ExcelProperty(value= "鐘舵��", index = 6)
+ private String str4;
+
+ @ExcelProperty(value= "鍔╄鐮�", index = 7)
+ private String str5;
+
+ @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
+ private String str6;
+
+ @ExcelProperty(value= "榛樿浠撳簱", index = 13)
+ private String str7;
+
+ @ExcelProperty(value= "鍝佺墝", index = 9)
+ private String str8;
+
+ @ExcelProperty(value= "閲囪喘鍛�", index = 11)
+ private String str9;
+
+ @ExcelProperty(value= "浜у湴", index = 12)
+ private String str10;
+
+// @ExcelProperty(value= "搴忓垪鍙风鐞�")
+ private String str11;
+
+// @ExcelProperty(value= "鎵规绠＄悊")
+ private String str12;
+
+// @ExcelProperty(value= "淇濊川鏈熷崟浣�")
+ private String str13;
+
+// @ExcelProperty(value= "淇濊川鏈熺鐞�")
+ private String str14;
+
+// @ExcelProperty(value= "淇濊川鏈�")
+ private String str15;
+
+ @ExcelProperty(value= "鍙攢鍞�", index = 20)
+ private String str16;
+
+ @ExcelProperty(value= "鍙噰璐�", index = 21)
+ private String str17;
+
+// @ExcelProperty(value= "鍙负瀛愪欢")
+ private String str18;
+
+// @ExcelProperty(value= "鍙负缁勪欢")
+ private String str19;
+
+// @ExcelProperty(value= "杈呭姪灞炴�х鐞�")
+ private String str20;
+
+ @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
+ private String str21;
+
+ @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
+ private String str22;
+
+ @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
+ private String str23;
+
+// @ExcelProperty(value= "棰勮澶╂暟")
+ private Double num1;
+
+// @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
+ private Double num2;
+
+// @ExcelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
+ private Double num3;
+
+// @ExcelProperty(value= "瀹夊叏搴撳瓨")
+ private Double num4;
+
+// @ExcelProperty(value= "绋庣巼")
+ private Double num5;
+
+ private Double num6;
+
+ public MatCodeExcel() {
+ }
+
+ public MatCodeExcel(String matNo, String barcode, String matName, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10, String str11, String str12, String str13, String str14, String str15, String str16, String str17, String str18, String str19, String str20, String str21, String str22, String str23, Double num1, Double num2, Double num3, Double num4, Double num5, Double num6) {
+ this.matNo = matNo;
+ this.barcode = barcode;
+ this.matName = matName;
+ this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
+ this.str4 = str4;
+ this.str5 = str5;
+ this.str6 = str6;
+ this.str7 = str7;
+ this.str8 = str8;
+ this.str9 = str9;
+ this.str10 = str10;
+ this.str11 = str11;
+ this.str12 = str12;
+ this.str13 = str13;
+ this.str14 = str14;
+ this.str15 = str15;
+ this.str16 = str16;
+ this.str17 = str17;
+ this.str18 = str18;
+ this.str19 = str19;
+ this.str20 = str20;
+ this.str21 = str21;
+ this.str22 = str22;
+ this.str23 = str23;
+ this.num1 = num1;
+ this.num2 = num2;
+ this.num3 = num3;
+ this.num4 = num4;
+ this.num5 = num5;
+ this.num6 = num6;
+ }
public String getMatNo() {
return matNo;
@@ -69,4 +174,227 @@
this.str1 = str1;
}
+ public String getStr2() {
+ return str2;
+ }
+
+ public void setStr2(String str2) {
+ this.str2 = str2;
+ }
+
+ public String getStr3() {
+ return str3;
+ }
+
+ public void setStr3(String str3) {
+ this.str3 = str3;
+ }
+
+ public String getStr4() {
+ return str4;
+ }
+
+ public void setStr4(String str4) {
+ this.str4 = str4;
+ }
+
+ public String getStr5() {
+ return str5;
+ }
+
+ public void setStr5(String str5) {
+ this.str5 = str5;
+ }
+
+ public String getStr6() {
+ return str6;
+ }
+
+ public void setStr6(String str6) {
+ this.str6 = str6;
+ }
+
+ public String getStr7() {
+ return str7;
+ }
+
+ public void setStr7(String str7) {
+ this.str7 = str7;
+ }
+
+ public String getStr8() {
+ return str8;
+ }
+
+ public void setStr8(String str8) {
+ this.str8 = str8;
+ }
+
+ public String getStr9() {
+ return str9;
+ }
+
+ public void setStr9(String str9) {
+ this.str9 = str9;
+ }
+
+ public String getStr10() {
+ return str10;
+ }
+
+ public void setStr10(String str10) {
+ this.str10 = str10;
+ }
+
+ public String getStr11() {
+ return str11;
+ }
+
+ public void setStr11(String str11) {
+ this.str11 = str11;
+ }
+
+ public String getStr12() {
+ return str12;
+ }
+
+ public void setStr12(String str12) {
+ this.str12 = str12;
+ }
+
+ public String getStr13() {
+ return str13;
+ }
+
+ public void setStr13(String str13) {
+ this.str13 = str13;
+ }
+
+ public String getStr14() {
+ return str14;
+ }
+
+ public void setStr14(String str14) {
+ this.str14 = str14;
+ }
+
+ public String getStr15() {
+ return str15;
+ }
+
+ public void setStr15(String str15) {
+ this.str15 = str15;
+ }
+
+ public String getStr16() {
+ return str16;
+ }
+
+ public void setStr16(String str16) {
+ this.str16 = str16;
+ }
+
+ public String getStr17() {
+ return str17;
+ }
+
+ public void setStr17(String str17) {
+ this.str17 = str17;
+ }
+
+ public String getStr18() {
+ return str18;
+ }
+
+ public void setStr18(String str18) {
+ this.str18 = str18;
+ }
+
+ public String getStr19() {
+ return str19;
+ }
+
+ public void setStr19(String str19) {
+ this.str19 = str19;
+ }
+
+ public String getStr20() {
+ return str20;
+ }
+
+ public void setStr20(String str20) {
+ this.str20 = str20;
+ }
+
+ public String getStr21() {
+ return str21;
+ }
+
+ public void setStr21(String str21) {
+ this.str21 = str21;
+ }
+
+ public String getStr22() {
+ return str22;
+ }
+
+ public void setStr22(String str22) {
+ this.str22 = str22;
+ }
+
+ public String getStr23() {
+ return str23;
+ }
+
+ public void setStr23(String str23) {
+ this.str23 = str23;
+ }
+
+ public Double getNum1() {
+ return num1;
+ }
+
+ public void setNum1(Double num1) {
+ this.num1 = num1;
+ }
+
+ public Double getNum2() {
+ return num2;
+ }
+
+ public void setNum2(Double num2) {
+ this.num2 = num2;
+ }
+
+ public Double getNum3() {
+ return num3;
+ }
+
+ public void setNum3(Double num3) {
+ this.num3 = num3;
+ }
+
+ public Double getNum4() {
+ return num4;
+ }
+
+ public void setNum4(Double num4) {
+ this.num4 = num4;
+ }
+
+ public Double getNum5() {
+ return num5;
+ }
+
+ public void setNum5(Double num5) {
+ this.num5 = num5;
+ }
+
+ public Double getNum6() {
+ return num6;
+ }
+
+ public void setNum6(Double num6) {
+ this.num6 = num6;
+ }
}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index 4ef5683..b8636f2 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,19 +54,15 @@
MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
if (matCodeService.selectById(data.getMatNo()) == null) {
MatCode matCode = new MatCode();
- matCode.setMatNo(data.getMatNo());
- matCode.setMatName(data.getMatName());
- matCode.setBarcode(data.getBarcode());
- matCode.setStr1(data.getStr1());
+ VersionUtils.setMatCode(matCode, data);
matCode.setModiTime(new Date());
matCode.setModiUser(this.userId);
matCode.setAppeTime(new Date());
matCode.setAppeUser(this.userId);
- list.add(matCode);
- total ++;
- if (!matCodeService.insertBatch(list)) {
+ if (!matCodeService.insert(matCode)) {
throw new CoolException("瀵煎叆鏁版嵁寮傚父");
}
+ total ++;
}
// 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
// if (list.size() >= BATCH_COUNT) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a3210c4..12eaea8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1