From ad2697fec86e0bfcc6e3ba20af7f973ccbb5abe7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 16:12:22 +0800
Subject: [PATCH] #物料
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 33 ++++++++---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 19 +++--
src/main/java/com/zy/asrs/entity/LocDetl.java | 20 +++---
src/main/java/com/zy/asrs/entity/MatCode.java | 28 ++++----
src/main/java/com/zy/asrs/entity/WrkDetl.java | 27 ++++----
5 files changed, 72 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0954644..097ad3e 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,29 +27,29 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
@TableId(value = "matnr", type = IdType.INPUT)
private String matnr;
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
private String lgnum;
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
@ApiModelProperty(value= "鏁伴噺")
@@ -61,7 +61,7 @@
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@ApiModelProperty(value= "澶囨敞")
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index ddaa1a0..e6f8431 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -20,9 +20,9 @@
private static final long serialVersionUID = 1L;
/**
- * 鐗╂枡缂栫爜
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -34,34 +34,34 @@
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= "")
@@ -166,7 +166,7 @@
public MatCode() {}
- public MatCode(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, Date date1, Long appeUser, Date appeTime, Long modiUser, Date modiTime, Short status) {
+ public MatCode(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,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
this.barcode = barcode;
this.matName = matName;
this.str1 = str1;
@@ -208,9 +208,9 @@
// MatCode matCode = new MatCode(
// null, // 鏉＄爜
-// null, // 鐗╂枡鍚嶇О
+// null, // 鍟嗗搧鍚嶇О
// null, // 鐗╂枡鍗曚綅
-// null, // 鐗╂枡瑙勬牸
+// null, // 瑙勬牸
// null, //
// null, //
// null, //
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 23d4a53..a18b5bf 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -14,16 +14,18 @@
@TableName("cust_wait_pakin")
public class WaitPakin implements Serializable {
+ private static final long serialVersionUID = 1L;
+
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@@ -36,31 +38,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -84,7 +86,7 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@ApiModelProperty(value= "搴撲綅鍙�")
@@ -145,4 +147,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9a72f82..304a28c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -36,15 +36,14 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
-
/**
* 浠撳簱鍙�
@@ -55,31 +54,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
- * 浠撳簱鍙�
+ * 鏉＄爜
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
- * 浠撳簱鍙�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
- * 浠撳簱鍙�
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
- * 浠撳簱鍙�
+ * 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -101,9 +100,9 @@
private String zpallet;
/**
- * 鐢ㄦ埛ID
+ * 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
/**
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 4803050..06afa71 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,18 +15,26 @@
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+ wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+ wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+ wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+ wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
- wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
+ wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+ wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
+ wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
+ wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+ wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+ wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -34,19 +42,26 @@
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+ locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+ locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+ locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
- locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+ locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
+ locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
+ locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+ locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+ locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
--
Gitblit v1.9.1