From 3a5159214df9c86fd1225072a1e1bf4761784b21 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 09:23:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java | 12 +
src/main/java/com/zy/asrs/entity/WaitPakin.java | 230 +++++++---------------------
src/main/resources/mapper/WaitPakinMapper.xml | 14 +
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 165 ++++++++++++++++++++
src/main/resources/mapper/BasPlcerrorMapper.xml | 16 ++
5 files changed, 264 insertions(+), 173 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
new file mode 100644
index 0000000..f8f681e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -0,0 +1,165 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+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.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_plcerror")
+public class BasPlcerror implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 寮傚父缂栧彿
+ */
+ @ApiModelProperty(value= "寮傚父缂栧彿")
+ @TableId(value = "error_code", type = IdType.INPUT)
+ @TableField("error_code")
+ private Integer errorCode;
+
+ /**
+ * 寮傚父鎻忚堪
+ */
+ @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @TableField("error_desc")
+ private String errorDesc;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ private Date modiTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("appe_time")
+ private Date appeTime;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ public BasPlcerror() {}
+
+ public BasPlcerror(Integer errorCode, String errorDesc, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
+ this.errorDesc = errorDesc;
+ this.modiTime = modiTime;
+ this.modiUser = modiUser;
+ this.appeTime = appeTime;
+ this.appeUser = appeUser;
+ }
+
+// BasPlcerror basPlcerror = new BasPlcerror(
+// null, // 寮傚父缂栧彿[闈炵┖]
+// null, // 寮傚父鎻忚堪
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null // 鍒涘缓鑰�
+// );
+
+ public Integer getErrorCode() {
+ return errorCode;
+ }
+
+ public void setErrorCode(Integer errorCode) {
+ this.errorCode = errorCode;
+ }
+
+ public String getErrorDesc() {
+ return errorDesc;
+ }
+
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ 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 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 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;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 05ed026..23d4a53 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,41 +1,23 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-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.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("cust_wait_pakin")
public class WaitPakin implements Serializable {
- private static final long serialVersionUID = 1L;
-
/**
- * 缂栧彿
+ * 鐗╂枡
*/
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鎵樼洏鐮�
- */
- @ApiModelProperty(value= "鎵樼洏鐮�")
- private String barcode;
-
- /**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡")
private String matnr;
/**
@@ -43,6 +25,43 @@
*/
@ApiModelProperty(value= "鐗╂枡鎻忚堪")
private String maktx;
+
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String lgnum;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ private String type;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supplier;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "浠撳簱")
+ private String warehouse;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鏁伴噺
@@ -54,13 +73,30 @@
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ private String altme;
/**
- * 鐘舵��
+ * 鎵樼洏鏉＄爜
*/
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ private String zpallet;
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value= "鐢ㄦ埛ID")
+ private String bname;
+
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
+ private Date locNo;
+
@ApiModelProperty(value= "鐘舵��")
private String status;
+
+ @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+ @TableField("io_status")
+ private String ioStatus;
/**
* 澶囨敞
@@ -96,134 +132,11 @@
@TableField("appe_user")
private Long appeUser;
- public WaitPakin() {}
-
- public WaitPakin(String barcode, String matnr, String maktx, Double anfme, String unit, String status, String memo, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
- this.barcode = barcode;
- this.matnr = matnr;
- this.maktx = maktx;
- this.anfme = anfme;
- this.unit = unit;
- this.status = status;
- this.memo = memo;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- }
-
-// WaitPakin waitPakin = new WaitPakin(
-// null, // 鎵樼洏鐮�
-// null, // 鐗╂枡缂栫爜
-// null, // 鐗╂枡鎻忚堪
-// null, // 鏁伴噺
-// null, // 鍗曚綅
-// null, // 鐘舵��
-// null, // 澶囨敞
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null // 鍒涘缓鑰�
-// );
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getMatnr() {
- return matnr;
- }
-
- public void setMatnr(String matnr) {
- this.matnr = matnr;
- }
-
- public String getMaktx() {
- return maktx;
- }
-
- public void setMaktx(String maktx) {
- this.maktx = maktx;
- }
-
- public Double getAnfme() {
- return anfme;
- }
-
- public void setAnfme(Double anfme) {
- this.anfme = anfme;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- 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 getAppeTime() {
- return appeTime;
}
public String getAppeTime$(){
@@ -232,27 +145,4 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- 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;
- }
-
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
new file mode 100644
index 0000000..93346b1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasPlcerror;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasPlcerrorMapper extends BaseMapper<BasPlcerror> {
+
+}
diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/BasPlcerrorMapper.xml
new file mode 100644
index 0000000..58c22d4
--- /dev/null
+++ b/src/main/resources/mapper/BasPlcerrorMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasPlcerrorMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror">
+ <result column="error_code" property="errorCode" />
+ <result column="error_desc" property="errorDesc" />
+ <result column="modi_time" property="modiTime" />
+ <result column="modi_user" property="modiUser" />
+ <result column="appe_time" property="appeTime" />
+ <result column="appe_user" property="appeUser" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 42be7fd..4615185 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,13 +4,21 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
- <id column="id" property="id" />
- <result column="barcode" property="barcode" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
+ <result column="lgnum" property="lgnum" />
+ <result column="type" property="type" />
+ <result column="color" property="color" />
+ <result column="supplier" property="supplier" />
+ <result column="warehouse" property="warehouse" />
+ <result column="brand" property="brand" />
<result column="anfme" property="anfme" />
- <result column="unit" property="unit" />
+ <result column="altme" property="altme" />
+ <result column="zpallet" property="zpallet" />
+ <result column="bname" property="bname" />
+ <result column="loc_no" property="locNo" />
<result column="status" property="status" />
+ <result column="io_status" property="ioStatus" />
<result column="memo" property="memo" />
<result column="modi_time" property="modiTime" />
<result column="modi_user" property="modiUser" />
--
Gitblit v1.9.1