From c267a7ec40f10b5918476d887bc399a9d6c08936 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 18 七月 2020 12:55:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 221 ---------------------
src/main/resources/mapper/WrkDetlMapper.xml | 13
src/main/java/com/zy/asrs/entity/WrkDetl.java | 261 ++-----------------------
src/main/webapp/static/js/common.js | 45 +++
pom.xml | 6
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 7
6 files changed, 77 insertions(+), 476 deletions(-)
diff --git a/pom.xml b/pom.xml
index 06eb849..e497317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,12 @@
<artifactId>easyexcel</artifactId>
<version>2.0.5</version>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.16.22</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index db9451b..c523cc6 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,16 +2,15 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
-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;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_wrk_detl")
public class WrkDetl implements Serializable {
@@ -38,40 +37,47 @@
private String matnr;
/**
+ * 鐗╂枡鎻忚堪
+ */
+ @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ private String maktx;
+
+
+ /**
* 浠撳簱鍙�
*/
@ApiModelProperty(value= "瑙勬牸")
private String lgnum;
/**
- * 杞偍璇锋眰缂栧彿
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private Integer tbnum;
+ @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ private String type;
/**
- * 琛岄」鐩�
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "琛岄」鐩�")
- private Integer tbpos;
+ @ApiModelProperty(value= "鍔╄鐮�")
+ private String mnemonic;
/**
- * 鐗╂枡鏍囩ID
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
- private String zmatid;
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supplier;
/**
- * 鐗╂枡鎻忚堪
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "浠撳簱")
+ private String warehouse;
/**
- * 宸ュ巶
+ * 浠撳簱鍙�
*/
- @ApiModelProperty(value= "宸ュ巶")
- private String werks;
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鏁伴噺
@@ -131,193 +137,11 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- private Double nista;
-
- public WrkDetl() {}
-
- public WrkDetl(Integer wrkNo,Date ioTime,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,Double nista) {
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- 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;
- this.nista = nista;
- }
-
-// WrkDetl wrkDetl = new WrkDetl(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鐗╂枡[闈炵┖]
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID[闈炵┖]
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- 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$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
}
public String getModiTime$(){
@@ -327,48 +151,11 @@
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);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- 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;
- }
-
- public Double getNista() {
- return nista;
- }
-
- public void setNista(Double nista) {
- this.nista = nista;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 7f41257..d3d976e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -3,15 +3,14 @@
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;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_wrk_detl_log")
public class WrkDetlLog implements Serializable {
@@ -134,190 +133,11 @@
@ApiModelProperty(value= "")
private Double nista;
- public WrkDetlLog() {}
-
- public WrkDetlLog(Integer wrkNo,Date ioTime,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,Double nista) {
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- 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;
- this.nista = nista;
- }
-
-// WrkDetlLog wrkDetlLog = new WrkDetlLog(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鐗╂枡缂栧彿[闈炵┖]
-// null, // 浠撳簱鍙穂闈炵┖]
-// null, // 杞偍璇锋眰缂栧彿[闈炵┖]
-// null, // 琛岄」鐩甗闈炵┖]
-// null, // 鐗╂枡鏍囩ID
-// null, // 鐗╂枡鎻忚堪
-// null, // 宸ュ巶
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鎵樼洏鏉＄爜
-// null, // 鐢ㄦ埛ID
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
-
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- 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$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
}
public String getModiTime$(){
@@ -327,48 +147,11 @@
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);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- 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;
- }
-
- public Double getNista() {
- return nista;
- }
-
- public void setNista(Double nista) {
- this.nista = nista;
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index bf07ae1..15b1b6e 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.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>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1526da3..fe57871 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -171,15 +171,48 @@
}
var matCols = [
- {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
+ {field: 'matNo', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
+ ,{field: 'matName', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅'}
+ ,{field: 'str2', align: 'center',title: '鍟嗗搧绫诲埆'}
+ ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'}
+ ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'str5', align: 'center',title: '鍔╄鐮�'}
+ ,{field: 'str6', align: 'center',title: '榛樿渚涘簲鍟�'}
+ ,{field: 'str7', align: 'center',title: '榛樿浠撳簱'}
+ // ,{field: 'str8', align: 'center',title: '鍝佺墝'}
+ // ,{field: 'str9', align: 'center',title: '閲囪喘鍛�'}
+ // ,{field: 'str10', align: 'center',title: '浜у湴'}
+ // ,{field: 'str11', align: 'center',title: '搴忓垪鍙风鐞�'}
+ // ,{field: 'str12', align: 'center',title: '鎵规绠＄悊'}
+ // ,{field: 'str13', align: 'center',title: '淇濊川鏈熷崟浣�'}
+ // ,{field: 'str14', align: 'center',title: '淇濊川鏈熺鐞�'}
+ // ,{field: 'str15', align: 'center',title: '淇濊川鏈�'}
+ // ,{field: 'str16', align: 'center',title: '鍙攢鍞�'}
+ ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true}
+ ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true}
+ // ,{field: 'str19', align: 'center',title: '鍙负缁勪欢'}
+ // ,{field: 'str20', align: 'center',title: '杈呭姪灞炴�х鐞�'}
+ ,{field: 'str21', align: 'center',title: '鎴愭湰璁＄畻鏂规硶', hide: true}
+ ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true}
+ ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true}
+ // ,{field: 'num1', align: 'center',title: '棰勮澶╂暟'}
+ // ,{field: 'num2', align: 'center',title: '鏈�浣庡簱瀛樻暟閲�'}
+ // ,{field: 'num3', align: 'center',title: '鏈�楂樺簱瀛樻暟閲�'}
+ // ,{field: 'num4', align: 'center',title: '瀹夊叏搴撳瓨'}
+ // ,{field: 'num5', align: 'center',title: '绋庣巼'}
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
+ ,{field: 'type', align: 'center',title: '鍟嗗搧绫诲埆'}
+ // ,{field: 'mnemonic', align: 'center',title: '鍔╄鐮�'}
+ // ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
+ // ,{field: 'warehouse', align: 'center',title: '浠撳簱'}
+ // ,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index ec80668..cf5dd90 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -467,13 +467,6 @@
}
}
-function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
-}
-
function detailScreen(index) {
var detail = layer.getChildFrame('#data-detail', index);
var height = detail.height()+60;
--
Gitblit v1.9.1