From 43ae4227516fad9ae87648e2ac10c61cdd8e47f8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 23 七月 2020 10:17:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 88 ++++++++----
src/main/resources/mapper/WrkDetlLogMapper.xml | 13 -
src/main/java/com/zy/asrs/utils/VersionUtils.java | 24 +++
src/main/java/com/zy/asrs/entity/LocDetl.java | 260 ++----------------------------------
src/main/resources/mapper/LocDetlMapper.xml | 11
src/main/java/com/zy/asrs/entity/WrkDetl.java | 22 +++
6 files changed, 133 insertions(+), 285 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 96e715d..b79839c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -10,168 +10,78 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_loc_detl")
public class LocDetl implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 搴撲綅鍙�
- */
@ApiModelProperty(value= "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
- /**
- * 鐗╂枡
- */
@ApiModelProperty(value= "鐗╂枡")
@TableId(value = "matnr", type = IdType.INPUT)
private String matnr;
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
-
- /**
- * 琛岄」鐩�
- */
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
-
- /**
- * 鐗╂枡鏍囩ID
- */
- @ApiModelProperty(value= "棰滆壊")
- private String zmatid;
-
- /**
- * 鐗╂枡鎻忚堪
- */
@ApiModelProperty(value= "鐗╂枡鎻忚堪")
private String maktx;
- /**
- * 宸ュ巶
- */
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
+ @ApiModelProperty(value= "瑙勬牸")
+ private String lgnum;
- /**
- * 鏁伴噺
- */
+ @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ private String type;
+
+ @ApiModelProperty(value= "鍔╄鐮�")
+ private String mnemonic;
+
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supplier;
+
+ @ApiModelProperty(value= "浠撳簱")
+ private String warehouse;
+
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
+
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
- /**
- * 鍗曚綅
- */
@ApiModelProperty(value= "鍗曚綅")
private String altme;
- /**
- * 鎵樼洏鏉＄爜
- */
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
- /**
- * 鐢ㄦ埛ID
- */
@ApiModelProperty(value= "鐢ㄦ埛ID")
private String bname;
- /**
- * 澶囨敞
- */
@ApiModelProperty(value= "澶囨敞")
private String memo;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- /**
- * 鍒涘缓鑰�
- */
@ApiModelProperty(value= "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
-
- public LocDetl() {}
-
- public LocDetl(String locNo, String matnr, String lgnum,Integer tbnum,Integer tbpos,String zmatid,String maktx,String werks,Double anfme,String altme,String zpallet,String bname,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.locNo = locNo;
- this.matnr = matnr;
- this.lgnum = lgnum;
- this.tbnum = tbnum;
- this.tbpos = tbpos;
- this.zmatid = zmatid;
- this.maktx = maktx;
- this.werks = werks;
- this.anfme = anfme;
- this.altme = altme;
- this.zpallet = zpallet;
- this.bname = bname;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// LocDetl locDetl = new LocDetl(
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID[闈炵┖]
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getLocNo() {
- return locNo;
- }
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -180,110 +90,6 @@
return String.valueOf(locMast.getLocNo());
}
return null;
- }
-
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public String getMatnr() {
- return matnr;
- }
-
- public void setMatnr(String matnr) {
- this.matnr = matnr;
- }
-
- public String getLgnum() {
- return lgnum;
- }
-
- public void setLgnum(String lgnum) {
- this.lgnum = lgnum;
- }
-
- public Integer getTbnum() {
- return tbnum;
- }
-
- public void setTbnum(Integer tbnum) {
- this.tbnum = tbnum;
- }
-
- public Integer getTbpos() {
- return tbpos;
- }
-
- public void setTbpos(Integer tbpos) {
- this.tbpos = tbpos;
- }
-
- public String getZmatid() {
- return zmatid;
- }
-
- public void setZmatid(String zmatid) {
- this.zmatid = zmatid;
- }
-
- public String getMaktx() {
- return maktx;
- }
-
- public void setMaktx(String maktx) {
- this.maktx = maktx;
- }
-
- public String getWerks() {
- return werks;
- }
-
- public void setWerks(String werks) {
- this.werks = werks;
- }
-
- public Double getAnfme() {
- return anfme;
- }
-
- public void setAnfme(Double anfme) {
- this.anfme = anfme;
- }
-
- public String getAltme() {
- return altme;
- }
-
- public void setAltme(String altme) {
- this.altme = altme;
- }
-
- public String getZpallet() {
- return zpallet;
- }
-
- public void setZpallet(String zpallet) {
- this.zpallet = zpallet;
- }
-
- public String getBname() {
- return bname;
- }
-
- public void setBname(String bname) {
- this.bname = bname;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
}
public String getModiUser$(){
@@ -295,14 +101,6 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
@@ -310,13 +108,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -327,24 +118,11 @@
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index c523cc6..57dd856 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -144,11 +147,29 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
}
public String getAppeTime$(){
@@ -157,6 +178,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index d3d976e..63f117a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,34 +34,10 @@
private Date ioTime;
/**
- * 鐗╂枡缂栧彿
+ * 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
+ @ApiModelProperty(value= "鐗╂枡")
private String matnr;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "浠撳簱鍙�")
- private String lgnum;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
-
- /**
- * 琛岄」鐩�
- */
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
-
- /**
- * 鐗╂枡鏍囩ID
- */
- @ApiModelProperty(value= "鐗╂枡鏍囩ID")
- private String zmatid;
/**
* 鐗╂枡鎻忚堪
@@ -66,11 +45,42 @@
@ApiModelProperty(value= "鐗╂枡鎻忚堪")
private String maktx;
+
/**
- * 宸ュ巶
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
+ @ApiModelProperty(value= "瑙勬牸")
+ private String lgnum;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ private String type;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "鍔╄鐮�")
+ private String mnemonic;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supplier;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "浠撳簱")
+ private String warehouse;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鏁伴噺
@@ -130,8 +140,6 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- private Double nista;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -140,6 +148,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
@@ -147,6 +164,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index aa623d0..0c84a50 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,12 +15,24 @@
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ wrkDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
+ wrkDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
+ wrkDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
+ wrkDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
+ wrkDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
+ wrkDetl.setBrand(matCode.getStr8()); // 鍝佺墝
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
+ wrkDetl.setType(locDetl.getType()); // 鍟嗗搧绫诲埆
+ wrkDetl.setMnemonic(locDetl.getMnemonic()); // 鍔╄鐮�
+ wrkDetl.setSupplier(locDetl.getSupplier()); // 榛樿渚涘簲鍟�
+ wrkDetl.setWarehouse(locDetl.getWarehouse()); // 榛樿浠撳簱
+ wrkDetl.setBrand(locDetl.getBrand()); // 鍝佺墝
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -28,12 +40,24 @@
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ locDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
+ locDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
+ locDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
+ locDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
+ locDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
+ locDetl.setBrand(matCode.getStr8()); // 鍝佺墝
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
+ locDetl.setType(wrkDetl.getType()); // 鍟嗗搧绫诲埆
+ locDetl.setMnemonic(wrkDetl.getMnemonic()); // 鍔╄鐮�
+ locDetl.setSupplier(wrkDetl.getSupplier()); // 榛樿渚涘簲鍟�
+ locDetl.setWarehouse(wrkDetl.getWarehouse()); // 榛樿浠撳簱
+ locDetl.setBrand(wrkDetl.getBrand()); // 鍝佺墝
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 89e1c85..5579b59 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -6,12 +6,13 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
<result column="loc_no" property="locNo" />
<result column="matnr" property="matnr" />
- <result column="lgnum" property="lgnum" />
- <result column="tbnum" property="tbnum" />
- <result column="tbpos" property="tbpos" />
- <result column="zmatid" property="zmatid" />
<result column="maktx" property="maktx" />
- <result column="werks" property="werks" />
+ <result column="lgnum" property="lgnum" />
+ <result column="type" property="type" />
+ <result column="mnemonic" property="mnemonic" />
+ <result column="supplier" property="supplier" />
+ <result column="warehouse" property="warehouse" />
+ <result column="brand" property="brand" />
<result column="anfme" property="anfme" />
<result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 8736b93..80653ac 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -7,12 +7,13 @@
<result column="wrk_no" property="wrkNo" />
<result column="io_time" property="ioTime" />
<result column="matnr" property="matnr" />
- <result column="lgnum" property="lgnum" />
- <result column="tbnum" property="tbnum" />
- <result column="tbpos" property="tbpos" />
- <result column="zmatid" property="zmatid" />
<result column="maktx" property="maktx" />
- <result column="werks" property="werks" />
+ <result column="lgnum" property="lgnum" />
+ <result column="type" property="type" />
+ <result column="mnemonic" property="mnemonic" />
+ <result column="supplier" property="supplier" />
+ <result column="warehouse" property="warehouse" />
+ <result column="brand" property="brand" />
<result column="anfme" property="anfme" />
<result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
@@ -22,8 +23,6 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
- <result column="nista" property="nista" />
-
</resultMap>
</mapper>
--
Gitblit v1.9.1