From d830c78d038e29404aa317d570eb4216c1131b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 27 Sep 2019 14:08:07 +0800 Subject: [PATCH 01/28] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 101 ++++++++++++++++++++- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- .../pojo/model/softswitch/BsSuitCaseModel.java | 3 + .../i3plus/pojo/softswitch/bean/BsSslKey.java | 9 +- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 61 +++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 77 ++++++++++++++++ .../repository/BsSuitCaseFTPRepository.java | 14 +++ .../repository/BsSuitCaseRESTRepository.java | 16 ++++ .../repository/BsSuitFileRepository.java | 14 +++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 35 ++++++- 10 files changed, 326 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 15e76a4..7e88112 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -25,7 +25,8 @@ public class BlockSoftSwitchEnumUtil { DATASOURCE(30,"数据源套件"), WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), - WEB_SOCKET(60,"WebSocket套件"); + WEB_SOCKET(60,"WebSocket套件"), + FTP(70,"FTP套件"); private int value; private String description; @@ -120,7 +121,11 @@ public class BlockSoftSwitchEnumUtil { CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"), + SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"), + + /* FTP */ + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器"); private int value; private String description; @@ -635,4 +640,96 @@ public class BlockSoftSwitchEnumUtil { return tmp; } } + + /** + * ftp传输编码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FTP_ENCODE { + CONN_SUCCESS(10, "UTF-8", "UTF-8"), + CONN_FAILURE(20, "GBK", "GBK"); + + private int value; + private String encode; + private String description; + + private FTP_ENCODE (int value,String encode, String description) { + this.value = value; + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getEncode() { + return encode; + } + + public String getDescription() { + return description; + } + + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].encode; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].encode.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static FTP_ENCODE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + public static String valueOfEncode(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].encode; + } + } + return tmp; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].encode.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9dc921e..1019b4e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -214,7 +214,7 @@ public class CommonEnumUtil { EXCEPTION(2, "异常"), EXCEPTION_DETAIL(3, "异常明细"), EXCEPTION_SOLUTION(4, "解决方案"), - EXCEPTION_ENUM(5, "枚举"), + ENUM(5, "枚举"), MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 810ec8a..ee83232 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -35,6 +35,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "REST 适配套件") private BsSuitCaseREST bsSuitCaseREST; + @ApiParam(value = "FTP 适配器") + private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java index 44820a8..dfab548 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.thoughtworks.xstream.annotations.XStreamAlias; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -74,6 +73,14 @@ public class BsSslKey extends BaseBean { @ApiParam(value = "证书描述") private String keyDescription; + @Column(name = "KEY_USER_NAME") + @ApiParam(value = "证书账号") + private String keyUserName; + + @Column(name = "KEY_PASSWORD") + @ApiParam(value = "证书密码") + private String keyPassword; + @Transient @ApiParam(value = "证书参数集合") private List bsSslKeyParamList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java new file mode 100644 index 0000000..6dba956 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-25 17:43 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_FTP") +@Api(value = "FTP适配器", description = "FTP适配器") +public class BsSuitCaseFTP extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "file_Name") + @ApiParam(value = "文件名") + private String fileName; + + @Column(name = "ENCODE") + @ApiParam(value = "编码") + private Integer encode; + + @Column(name = "IS_READ_AND_EMPTY") + @ApiParam(value = "读取并清空") + private Integer isReadAndEmpty; + + @Column(name = "IS_READ_AND_DELETE") + @ApiParam(value = "读取并删除") + private Integer isReadAndDelete; + + @Column(name = "IS_NEED_TRAVERSAL") + @ApiParam(value = "是否需要遍历") + private Integer isNeedTraversal; + + @Column(name = "IS_INCREMENTAL_READ") + @ApiParam(value = "是否增量读取") + private Integer isIncrementalRead; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java new file mode 100644 index 0000000..8c228ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-25 17:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_FILE") +@Api(value = "适配文件信息", description = "适配文件信息") +public class BsSuitFile extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + + @Column(name = "FOLDER_PATH") + @ApiParam(value = "文件夹路径") + private String folderPath; + + @Column(name = "FILE_ID") + @ApiParam(value = "文件id") + private String fileId; + + @Column(name = "FILE_NAME") + @ApiParam(value = "文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam(value = "文件URL") + private String fileURL; + + @Column(name = "FILE_SIZE") + @ApiParam(value = "文件大小") + private int fileSize; + + @Column(name = "SUIT_DATE_TIME") + @ApiParam(value = "适配时间") + private String suitDateTime; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private Integer processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java new file mode 100644 index 0000000..f59a30e --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseFTPRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseFTP; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-27 10:16 + * @Modify: + **/ +public interface BsSuitCaseFTPRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java new file mode 100644 index 0000000..53d3da9 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRESTRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseREST; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-23 15:39 + * @Modify: + **/ +@Repository +public interface BsSuitCaseRESTRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java new file mode 100644 index 0000000..91eb235 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitFileRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-27 10:17 + * @Modify: + **/ +public interface BsSuitFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index d999d66..e5e4f2b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,8 +4,19 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.*; -import org.apache.commons.lang3.StringUtils; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; /** * @Description : @@ -350,4 +361,24 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + + /** + * 适配文件条件封装 + * @param bsSuitFile 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); + + ddlPackBean.setOrderByStr(bsSuitFile.orderBy()); + + return ddlPackBean; + } } From aea18f89c6f0bf7bb84b81d55cc4eafe04889f87 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 14:36:27 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4openInfo?= =?UTF-8?q?=EF=BC=8C=20=E5=AE=89=E7=81=AF=E5=93=8D=E5=BA=94=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5signSendFlag?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 674dd65..dbdc07e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -392,7 +392,7 @@ public class AndonManageQueue extends BaseBean { * @param workCellCode * @param workCellNameRdd * @param alarmCode - * @param ecCode + * @param ecCodec * @param ecNameRdd * @param emCode * @param emNameRdd diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index b7aef8e..d66158f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -268,6 +268,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "放行说明") private String openInfo; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From 81d86d1bd2ac5ea4b8b99b33c644e35e457a5a05 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 17:22:10 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} (88%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java similarity index 88% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 9957a5f..ff3329d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean.iotio; import lombok.Data; import java.io.Serializable; - @Data -public class wmsCSOrderDetailsModel implements Serializable { +public class WmsCSOrderDetailsModel implements Serializable { /****** From ff272afe2c18c1b4725e975992f0e89227f3e127 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 17:57:13 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index e356a41..e955336 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -163,7 +163,7 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(mesWorkCell.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, result); From 4fc72ca358135a97c1dfadc9a4e6137b90ab0d78 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 19:57:20 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index ff3329d..6e2b61d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -7,6 +7,14 @@ import java.io.Serializable; public class WmsCSOrderDetailsModel implements Serializable { + + /****** + * + * 工厂代码 + */ + public String organizeCode; + + /****** * * 库位编码 From 10ce1e165ecf9c90a65aa0985a03f600990ea593 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 29 Sep 2019 20:56:16 +0800 Subject: [PATCH 06/28] add order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 ++++ .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 + .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 8 ++++ .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 2 + .../estsh/i3plus/pojo/aps/bean/OperResource.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 5 ++ .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 9 ++++ .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 3 ++ .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 + .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 7 +++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 40 +++++++++++----- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 16 +++---- .../estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 6 +++ .../i3plus/pojo/aps/holders/EProductOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../pojo/aps/repository/ParentWorkRepository.java | 9 ++++ .../src/main/resources/relations/BaseOrder.xml | 2 - .../src/main/resources/relations/ParentWork.xml | 5 ++ .../src/main/resources/relations/ProductOrder.xml | 2 + 27 files changed, 181 insertions(+), 23 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index cf27632..074435b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -5,11 +5,13 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.MappedSuperclass; import java.util.Date; import java.util.List; @@ -21,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { @Column(name="COUNT") @@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode { @FieldAnnotation(property = false) private Long materialId; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); } @@ -73,18 +77,22 @@ public class BaseOrder extends BaseCode { BeanRelation.set(this, EBaseOrder.Material, material); } + @JsonBackReference public List getPrevRelations() { return BeanRelation.list(this, EBaseOrder.PrevRelations); } + @JsonBackReference public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } + @JsonBackReference public List getUpperOrders() { return BeanRelation.list(this, EBaseOrder.UpperOrders); } + @JsonBackReference public List getLowerOrders() { return BeanRelation.list(this, EBaseOrder.LowerOrders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 27d70a9..458c9a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EExportProject; +import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -45,6 +46,7 @@ public class ExportProject extends BaseAPS { BeanRelation.set(this, EExportProject.Link, link); } + @JsonBackReference public List getDetails() { return BeanRelation.list(this, EExportProject.Details); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 731a820..35e8af3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportProject; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +44,7 @@ public class ImportProject extends BaseAPS { BeanRelation.set(this, EImportProject.Link, link); } + @JsonBackReference public List getDetails() { return BeanRelation.list(this, EImportProject.Details); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 54d7fc4..89699c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,6 +39,7 @@ public class Inventory extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index a42d97e..fc3af62 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE; import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -107,30 +108,37 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EMaterial.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EMaterial.OperOutputs); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EMaterial.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EMaterial.WorkOutputs); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EMaterial.WorkRelations); } + @JsonBackReference public List getOrders() { return BeanRelation.list(this, EMaterial.Orders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 1ad9690..ef5aac9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperInput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -78,6 +79,7 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Material, material); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EOperInput.WorkInputs); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 41a13fa..5e98d6e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperOutput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -65,6 +66,7 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Material, material); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EOperOutput.WorkOutputs); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index f0859f7..b56b850 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EOperResource; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -86,6 +87,7 @@ public class OperResource extends BaseAPS { BeanRelation.set(this, EOperResource.Resource, res); } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EOperResource.WorkResources); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 4f6513a..9c6b580 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; import cn.estsh.i3plus.pojo.aps.holders.EOperation; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -96,14 +97,17 @@ public class Operation extends BaseAPS { BeanRelation.set(this, EOperation.ProductRouting, routing); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EOperation.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EOperation.OperOutputs); } + @JsonBackReference public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -117,6 +121,7 @@ public class Operation extends BaseAPS { BeanRelation.set(this, EOperation.StandOperation, std); } + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EOperation.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java new file mode 100644 index 0000000..d066cc9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EParentWork; +import com.fasterxml.jackson.annotation.JsonBackReference; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @Description :父工作 + * 父工作用于记录工作分割前的信息。 + * 生产订单应关联父工作，父工作关联多个工作。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_PARENT_WORK") +@Api("父工作") +public class ParentWork extends BaseAPS { + @Column(name="count") + @ApiParam(value ="数量") + private Double count; + + @Column(name="PRODUCT_ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long productOrderId; + + public BaseOrder getProductOrder() { + return BeanRelation.get(this, EParentWork.ProductOrder); + } + + public void setProductOrder(ProductOrder order) { + this.productOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EParentWork.ProductOrder, order); + } + + @JsonBackReference + public List getWorks() { + return BeanRelation.list(this, EParentWork.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 64f17c0..23bcbe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :生产订单 @@ -85,6 +87,10 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="缺少量") private Double lackCount; + @Column(name="AUTO_SUPPLY") + @ApiParam(value ="物料计算时自动补充") + private Boolean autoSupply; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) @@ -98,4 +104,7 @@ public class ProductOrder extends BaseOrder { this.productRoutingId = routing != null ? routing.getId() : 0l; BeanRelation.set(this, EProductOrder.ProductRouting, routing); } + + @JsonBackReference + public List getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index ed21d2d..7cf68ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -52,10 +53,12 @@ public class ProductRouting extends BaseCode { BeanRelation.set(this, EProductRouting.Material, material); } + @JsonBackReference public List getOperations() { return BeanRelation.list(this, EProductRouting.Operations); } + @JsonBackReference public List getProductOrders() { return BeanRelation.list(this, EProductRouting.ProductOrders); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index b1676d8..eab91d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,6 +47,11 @@ public class PurchaseOrder extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + @Column(name="AUTO_SUPPLY") + @ApiParam(value ="物料计算时自动补充") + private Boolean autoSupply; + + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index f5a85dd..e74a116 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +44,7 @@ public class SalesOrder extends BaseOrder { @ApiParam(value ="提前期计算值") private String calcLeadTime; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 2dc7c4b..44daa75 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS; import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWork; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -115,22 +116,27 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Order, order); } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EWork.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EWork.WorkOutputs); } + @JsonBackReference public List getWorkRelationInputs() { return BeanRelation.list(this, EWork.WorkRelationInputs); } + @JsonBackReference public List getWorkRelationOutputs() { return BeanRelation.list(this, EWork.WorkRelationOutputs); } @@ -144,6 +150,7 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Operation, oper); } + @JsonBackReference public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 2a5dc70..c74f140 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -62,6 +63,7 @@ public class WorkInput extends BaseAPS { BeanRelation.set(this, EWorkInput.Work, work); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EWorkInput.WorkRelations); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 16ce459..49116dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -63,6 +64,7 @@ public class WorkOutput extends BaseAPS { BeanRelation.set(this, EWorkOutput.Work, work); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EWorkOutput.WorkRelations); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 016d92e..a0f477b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; +import java.util.function.Consumer; public class BeanInfo { private Class cls; @@ -103,6 +104,14 @@ public class BeanInfo { return null; } + public Class getRelationClass(Enum holder) { + RelationInfo relaInfo = getRelationInfo(holder); + if (relaInfo != null) { + return relaInfo.getBeanInfo().getBeanClass(); + } + return null; + } + public RELATION_TYPE getRelationType(Enum holder) { RelationInfo relaInfo = getRelationInfo(holder); if (relaInfo != null) { @@ -120,31 +129,40 @@ public class BeanInfo { return RELATION_TYPE.INVALID; } - public List> getAllHolders() { - List> holders = new ArrayList<>(); + private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - holders.add(entry.getKey()); + fun.accept(entry.getValue()); + } + if (this.superBeanInfo != null) { + this.superBeanInfo.foreach(fun); } + } + + public List> getAllHolders() { + List> holders = new ArrayList<>(); + foreach((RelationInfo info)->{ + holders.add(info.getHolder()); + }); return holders; } public List> getOwnerHolders() { List> owners = new ArrayList<>(); - for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - if (entry.getValue().isOwner()) { - owners.add(entry.getKey()); + foreach((RelationInfo info)->{ + if (info.isOwner()) { + owners.add(info.getHolder()); } - } + }); return owners; } public List> getNormalSigns() { List> holders = new ArrayList<>(); - for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - if (!entry.getValue().isOwner()) { - holders.add(entry.getKey()); + foreach((RelationInfo info)->{ + if (!info.isOwner()) { + holders.add(info.getHolder()); } - } + }); return holders; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index f68cc74..af5476a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,7 +25,7 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private int time = 0; + private long time = 0; private double rate = 0.0; private boolean bValid = false; @@ -60,7 +60,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public int getTime() { + public long getTime() { return this.time; } @@ -68,7 +68,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(int time) { + public void setTime(long time) { this.time = time; } @@ -92,25 +92,25 @@ public class DateDuration { return "0S"; } - int iMaxTimeUnit = 4; + long iMaxTimeUnit = 4; StringBuffer strExtraString = new StringBuffer(); - int extraTime = this.time; + long extraTime = this.time; if (iMaxTimeUnit >= 4) { - int i = extraTime / 86400; + long i = extraTime / 86400; if (i > 0) { strExtraString.append(i).append("D"); } extraTime -= i * 86400; } if (iMaxTimeUnit >= 3) { - int i = extraTime / 3600; + long i = extraTime / 3600; if (i > 0) { strExtraString.append(i).append("H"); } extraTime -= i * 3600; } if (iMaxTimeUnit >= 2) { - int i = extraTime / 60; + long i = extraTime / 60; if (i > 0) { strExtraString.append(i).append("M"); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java index 373afaf..89f6644 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java @@ -10,5 +10,6 @@ package cn.estsh.i3plus.pojo.aps.enums; public enum MATERIAL_TYPE { PRODUCT, // 成品 HALF_PRODUCT, // 半成品 - RAW_MATERIAL // 原材料 + RAW_MATERIAL, // 原材料 + VIRTUAL // 虚拟件 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java new file mode 100644 index 0000000..aa66b75 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EParentWork { + ProductOrder, + Works +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java index 9ad0f8a..5b2f068 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EProductOrder { - ProductRouting + ProductRouting, + ParentWorks } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 507848d..59568c1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWork { Order, + ParentWork, WorkResources, WorkInputs, WorkOutputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java new file mode 100644 index 0000000..f71fb80 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ParentWork; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ParentWorkRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml index 65c1fe1..3b1c1f3 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml @@ -8,6 +8,4 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml new file mode 100644 index 0000000..5db40d1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml index 40fa8d7..983dd3b 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file From 82fe491bd33951e2f142e51d3bc07d4796505a3f Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 30 Sep 2019 09:25:26 +0800 Subject: [PATCH 07/28] =?UTF-8?q?#1050=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 93 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 + .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 + .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 5 ++ .../pojo/mes/pcn/model/PlcCacheKeyModel.java | 5 +- .../pojo/mes/pcn/model/StationRequestBean.java | 4 + .../pcn/repository/MesWcEquipmentRepository.java | 13 +++ .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 + .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 4 + 10 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6795c79..13a75d7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -905,7 +905,8 @@ public class MesEnumUtil { STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), - TASK_COMPLETE("taskComplete", "整个扫描完成"); + TASK_COMPLETE("taskComplete", "整个扫描完成"), + RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 1fba6f6..c40458a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1160,4 +1160,97 @@ public class MesPcnEnumUtil { } } + /** + * MesRoute 流程的类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTE_TYPE { + + SCAN(10, "扫描流程"), + MONITOR(20, "监控流程"); + + private int value; + private String description; + + ROUTE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 64a9e9c..f25e3b5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -78,4 +78,8 @@ public class MesPlc extends BaseBean { @Column(name = "ENABLED") @ApiParam("是否启用 0 false 1 true") private Integer enabled; + + @Column(name = "PLC_CFG") + @ApiParam("PLC的值的设定") + private String plcCfg; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index d76b0d8..8295380 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean { @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 1a2949f..315c1f4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -38,4 +38,9 @@ public class MesRoute extends BaseBean { @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; + + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java index ef2610f..46c84c5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java @@ -21,14 +21,13 @@ public class PlcCacheKeyModel { private String tag; - public PlcCacheKeyModel(String channel, String device, String tag) { - this.channel = channel; + public PlcCacheKeyModel( String device, String tag) { this.device = device; this.tag = tag; } public String getPlcCacheKey() { - return channel + ":" + device + ":" + tag; + return device + ":" + tag; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index 9ee5b73..cf69df3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -57,4 +58,7 @@ public class StationRequestBean implements Serializable { */ @ApiParam("业务类型") private String busiType; + + @ApiParam("工单号") + private String workOrderNo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..e1e757d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/28 12:04 PM + * @Description: + **/ +public interface MesWcEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index d66c490..8ef8f1e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean { @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index fadd550..603403b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -38,4 +38,8 @@ public class MesRoute extends BaseBean { @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; } From 692110b92b0c40786e1bf538ea231f7275e81f12 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 12:10:44 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=E5=A2=9E=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 84ecce4..8736d15 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3632,5 +3632,63 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 物流规则 处理模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTING_RULE_MODE { + CREATE_TASK(10, "CREATE_TASK", "生成任务"), + AUTO_OPT(20, "AUTO_OPT", "自动操作"), + MENU_OPT(30, "MENU_OPT", "手工操作"), + AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + + private int value; + private String code; + private String description; + + ROUTING_RULE_MODE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } \ No newline at end of file From 8beee972a9b54aac9fa7c01ece6050ae7cc5599e Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 12:14:08 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 8736d15..016db6d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3643,7 +3643,6 @@ public class WmsEnumUtil { AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); - private int value; private String code; private String description; From e90c59ccf2f04d98b87ca0b58fc0dbb0920a9618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 30 Sep 2019 13:31:59 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E5=BD=93=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A=E6=9D=A1=E5=AD=90?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=97=B6=E6=9F=A5=E8=AF=A2=E7=9A=84SQL?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9EitemQty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 82a84e2..cd708d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -92,11 +92,14 @@ public class WmsBom extends BaseBean { return this.itemQty == null ? 0 : this.itemQty.doubleValue(); } - public WmsBom(){} - public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) { + public WmsBom() { + } + + public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) { this.itemPartNo = itemPartNo; this.itemPartNam = itemPartNam; this.itemUnit = itemUnit; this.bomNum = bomNum; + this.itemQty = itemQty; } } From 4ceba7144cf0ac3a16f1073104813ea4e789fa5f Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 30 Sep 2019 14:06:36 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E4=BF=AE=E6=94=B9=E3=80=91=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 016db6d..a1fa720 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3642,7 +3642,7 @@ public class WmsEnumUtil { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); private int value; private String code; private String description; From 5a5b7b882e273de03118752ea10c704c36aa5e34 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Mon, 30 Sep 2019 14:13:55 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 84ecce4..e659006 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3351,7 +3351,10 @@ public class WmsEnumUtil { public enum INVENTORY_DIFFERENCE_TYPE { INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"), INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), - INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"); + INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), + INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), + INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"), + INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); private int value; private String code; From 980cb2a56b45e5e6504f9463b62ad27d765f42f2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 30 Sep 2019 16:50:05 +0800 Subject: [PATCH 13/28] add product order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 +++--- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 8 +----- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 14 ++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 32 ++++++++++++++++------ .../estsh/i3plus/pojo/aps/holders/EOperation.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 1 + .../src/main/resources/relations/ParentWork.xml | 2 ++ .../src/main/resources/relations/Work.xml | 2 +- 8 files changed, 47 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 074435b..a6f4432 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -34,12 +34,12 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="优先级") private Integer priority; - @Column(name="最晚结束时刻") - @ApiParam(value ="工作筛选") + @Column(name="LET") + @ApiParam(value ="最晚结束时刻") private Date let; - @Column(name="最早开始时刻计算值") - @ApiParam(value ="工作筛选") + @Column(name="CALC_EST") + @ApiParam(value ="最早开始时刻计算值") private Date calcEst; @Column(name="CALC_LET") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 9c6b580..620909a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; @@ -108,7 +107,7 @@ public class Operation extends BaseAPS { } @JsonBackReference - public List getOperResources() { + public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -120,9 +119,4 @@ public class Operation extends BaseAPS { this.standOperationId = std != null ? std.getId() : 0l; BeanRelation.set(this, EOperation.StandOperation, std); } - - @JsonBackReference - public List getWorks() { - return BeanRelation.list(this, EOperation.Works); - } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index d066cc9..a81d45f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long productOrderId; + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } @@ -46,6 +51,15 @@ public class ParentWork extends BaseAPS { BeanRelation.set(this, EParentWork.ProductOrder, order); } + public Operation getOperation() { + return BeanRelation.get(this, EParentWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EParentWork.Operation, oper); + } + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EParentWork.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 44daa75..ee20430 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -107,6 +107,11 @@ public class Work extends BaseCode { @FieldAnnotation(property = false) private Long operationId; + @Column(name="PARENT_WORK_ID") + @ApiParam(value ="父工作") + @FieldAnnotation(property = false) + private Long parentWorkId; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -116,6 +121,24 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Order, order); } + public Operation getOperation() { + return BeanRelation.get(this, EWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EWork.Operation, oper); + } + + public ParentWork getParentWork() { + return BeanRelation.get(this, EWork.ParentWork); + } + + public void setParentWork(ParentWork parentWork) { + this.parentWorkId = parentWork != null ? parentWork.getId() : 0l; + BeanRelation.set(this, EWork.ParentWork, parentWork); + } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); @@ -141,15 +164,6 @@ public class Work extends BaseCode { return BeanRelation.list(this, EWork.WorkRelationOutputs); } - public Operation getOperation() { - return BeanRelation.get(this, EWork.Operation); - } - - public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; - BeanRelation.set(this, EWork.Operation, oper); - } - @JsonBackReference public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java index 42f06cc..85a4795 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java @@ -5,6 +5,5 @@ public enum EOperation { OperInputs, OperOutputs, OperResources, - StandOperation, - Works + StandOperation } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java index aa66b75..334c388 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -2,5 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EParentWork { ProductOrder, + Operation, Works } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml index 5db40d1..9572cad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 1bb7816..5bb1d26 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -10,7 +10,7 @@ - + From 77a8cdebd5039102ac605b45d9f593b5c5c9b3fa Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 30 Sep 2019 18:14:33 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index e955336..d90de3f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -267,7 +267,7 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); @@ -462,6 +462,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result); getStringBuilderPack(responseCfg, result); From d8c740819cdc15a2280bfb6c17de9bcc38b75dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Sep 2019 18:41:40 +0800 Subject: [PATCH 15/28] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 4 ++-- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++++- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 27 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 3 ++- .../pojo/softswitch/bean/BsSuitSchedule.java | 4 ++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 2 +- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 31c96aa..1a64e2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -133,7 +133,7 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); private int value; private String description; @@ -663,7 +663,7 @@ public class BlockSoftSwitchEnumUtil { private FTP_ENCODE (int value,String encode, String description) { this.value = value; - this.value = value; + this.encode = encode; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1019b4e..a39b0e4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; /** * @Description : @@ -170,6 +169,14 @@ public class CommonEnumUtil { public static String valueOfDescription(int val) {return valueOf(val);} public static int descriptionOfValue(String desc) {return descOf(desc);} + public static boolean valueOfBoolean(int val) { + if(val == TRUE.value){ + return true; + }else { + return false; + } + } + } /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index 6dba956..db6e129 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -12,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -46,16 +49,40 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; + public boolean isReadAndEmpty(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty); + } + @Column(name = "IS_READ_AND_DELETE") @ApiParam(value = "读取并删除") private Integer isReadAndDelete; + public boolean isReadAndDelete(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete); + } + @Column(name = "IS_NEED_TRAVERSAL") @ApiParam(value = "是否需要遍历") private Integer isNeedTraversal; + public boolean isNeedTraversal(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal); + } + @Column(name = "IS_INCREMENTAL_READ") @ApiParam(value = "是否增量读取") private Integer isIncrementalRead; + public boolean isIncrementalRead(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); + } + + @Transient + @ApiParam(value = "是否增量读取") + private String tempSuitFilePath; + + @Transient + @ApiParam(value = "适配文件列表") + public List bsSuitFileList; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 8c228ba..d6a3655 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -48,7 +48,8 @@ public class BsSuitFile extends BaseBean { @Column(name = "FILE_ID") @ApiParam(value = "文件id") - private String fileId; + @JsonSerialize(using = ToStringSerializer.class) + private Long fileId; @Column(name = "FILE_NAME") @ApiParam(value = "文件名称") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index 378a7cd..3f0cee2 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -39,6 +39,10 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + @Column(name = "SCHEDULE_NAME") @ApiParam(value = "任务名称") private String scheduleName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e5e4f2b..0f00093 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -179,7 +179,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean); From 72c9a5892d6db514c139b7bbe63160c44b836597 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 8 Oct 2019 10:47:48 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java index 9283664..243e1b4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="MES_CUSTOMER") -@Api("客户产线代码") +@Api("客户信息") public class MesCustomer extends BaseBean { @Column(name="CUSTOMER_CODE") @ApiParam("客户代码") From 9b6887dd406226010ee1721421251ad779fae9a8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 8 Oct 2019 11:14:56 +0800 Subject: [PATCH 17/28] =?UTF-8?q?#1050=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 +--- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index 8295380..d345465 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -39,7 +39,5 @@ public class MesProdRouteCfg extends BaseBean { @ApiParam("流程代码") private String routeCode; - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 315c1f4..90fc4d3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -35,12 +35,13 @@ public class MesRoute extends BaseBean { @ApiParam("流程名称") private String routeName; + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; + @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; } From cecd37a1e79bccd7a2d17de20511b5ac88d8b0a5 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 8 Oct 2019 16:53:17 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Xml=20=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 19 ++++++++++- .../pojo/model/softswitch/SuitParamModel.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 +++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 1a64e2d..7f1caa6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -477,7 +477,9 @@ public class BlockSoftSwitchEnumUtil { STRING(20,"字符串"), BOOLEAN(30,"布尔"), MAP(40,"字典"), - LIST(50,"列表"); + LIST(50,"列表"), + JAVA_OBJECT(60,"Java Object"), + JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object"); private int value; private String description; @@ -504,6 +506,21 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static PARAM_VALUE_TYPE valueOfValueStr(String value){ + PARAM_VALUE_TYPE result = PARAM_VALUE_TYPE.STRING; + try { + if(StringUtils.isNotBlank(value)){ + for (int i = 0; i < values().length; i++) { + if (values()[i].value == Integer.parseInt(value)) { + return values()[i]; + } + } + } + }catch (Exception e){ + } + return result; + } } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java new file mode 100644 index 0000000..19b19eb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/10/8 下午1:18 + * @Modify: + **/ +@Data +public class SuitParamModel { + + /* 标签名称 */ + private String tagName; + /* 标签 id 属性值 */ + private String id; + /* 标签 name 属性值 */ + private String name; + /* 标签唯一标识 */ + private String pathKey; + /* 标签内容 */ + private String value; + /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */ + private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE + + /* 标签属性 */ + private Map attr; + /* 父节点 */ + private SuitParamModel parent; + /* 标签子集 */ + private List childList; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b22545b..c24db02 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -215,6 +215,10 @@ public class BsSuitCase extends BaseBean { private BsSslKey bsSslKey; @Transient + @ApiParam(value = "适配器套件明细") + private String paramXml; + + @Transient @ApiParam(value = "适配器参数") private List bsSuitCaseParamList; From 2b62357ab57443969b26654a28903d6525dd7a2b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 8 Oct 2019 17:40:15 +0800 Subject: [PATCH 19/28] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=E3=80=90=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B71051?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 13 ++++++-- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 +++ .../pojo/wms/engine/rule/GenerateSnRule.java | 5 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 36 +++++++++++++++++----- 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e01b83b..9e9f331 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3579,6 +3579,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PART_ASSOCIATE_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** @@ -3635,8 +3644,8 @@ public class WmsEnumUtil { return tmp; } } - - + + /** * 物流规则 处理模式 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fa09e20..82bfeeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -162,6 +162,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("类型名称") public String busiTypeName; + @Transient + @ApiParam("物料编号") + public String partNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java index 6432f58..5ed6569 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java @@ -42,4 +42,9 @@ public class GenerateSnRule { * 库位来源 */ private Integer locateSource; + + /** + * 是否允许生成二维码 + */ + private Integer isSn2d; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b6cafeb..88dc044 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2376,9 +2376,9 @@ public class WmsHqlPack { return result; } - - - + + + /** * 业务：库存查询封装 * @@ -2388,24 +2388,44 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); // DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + getStringBuilderPack(wmsRoutingRule, result); return result; } + + /** + * 物料关系查询条件封装 + * + * @param wmsPartRelation + * @return + */ + public static DdlPackBean packHqlWmsPartRelation(WmsPartRelation wmsPartRelation) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringRightLikerPack(wmsPartRelation.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateCode(), "associateCoded", result); + DdlPreparedPack.getStringLikerPack(wmsPartRelation.getAssociateNameAdd(), "associateNameAdd", result); + DdlPreparedPack.getNumEqualPack(wmsPartRelation.getAssociateType(), "associateType", result); + + getStringBuilderPack(wmsPartRelation, result); + + return result; + } } From 7ee11674abb515ac7103c981dccefaddd5c82d70 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 8 Oct 2019 21:13:05 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 11 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 60 +++++++++++----------- 2 files changed, 37 insertions(+), 34 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 13a75d7..c73775b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1243,11 +1243,12 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "person", "人"), - EQUIPMENT(20, "equipment", "机"), - MATERIAL(30, "material", "料"), - ROUTE(40, "route", "法"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + PERSON(10, "person", "人员"), + EQUIPMENT(20, "equipment", "设备"), + MATERIAL(30, "material", "物料"), + ROUTE(40, "route", "工艺"), + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), + MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index c40458a..609c60e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -403,11 +403,13 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "people", "人"), + PERSON(10, "people", "人员"), EQUIPMENT(20, "equipments", "设备"), MATERIAL(30, "materials", "物料"), ROUTE(40, "routes", "工艺"), - ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), + MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); + private int value; private String code; @@ -620,10 +622,10 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), + SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"); private int value; private String code; @@ -632,7 +634,7 @@ public class MesPcnEnumUtil { private int defaultPort; private String defaultSchemaPattern; - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) { this.value = value; this.code = code; this.description = description; @@ -715,47 +717,47 @@ public class MesPcnEnumUtil { return tmp; } - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); + public String getJDBCUrl(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQL(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); } return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) { + if (StringUtils.isNotBlank(databaseProductName)) { + if (databaseProductName.indexOf(":mysql:") != -1) { return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ + } else if (databaseProductName.indexOf(":oracle:") != -1) { return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ + } else if (databaseProductName.indexOf(":postgresql:") != -1) { return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + } else if (databaseProductName.indexOf(":sqlserver:") != -1) { return SOURCE_SQL_SERVER; } } return null; } - private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + private String getJDBCUrlMySQL(String database, String host, Integer port) { + return "jdbc:mysql://" + host + ":" + port + "/" + database + "?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; } - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + private String getJDBCUrlOracle(String database, String host, Integer port) { + return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database; } - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; + private String getJDBCUrlPostgreSQL(String database, String host, Integer port) { + return "jdbc:postgresql://" + host + ":" + port + "/" + database; } - private String getJDBCUrlSQLServer(String database,String host,Integer port){ + private String getJDBCUrlSQLServer(String database, String host, Integer port) { return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database; } } From 653c8dca1f96f19fb3cc9d5b339bb92072034c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 8 Oct 2019 21:42:12 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=89=A3=E5=87=8FJOB=E8=BF=87=E6=BB=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E7=BA=BF=E8=BE=B9=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E6=9D=A1=E7=A0=81=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b6cafeb..9789500 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1533,19 +1533,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getNumNOEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); - if(wmsStockSn.getPrinted()!= null){ - if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); - } - } - getStringBuilderPack(wmsStockSn, result); return result; } From f682d056be1c7ed47819fb1a3997a3ba23c5ddc5 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 9 Oct 2019 09:15:24 +0800 Subject: [PATCH 22/28] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 88dc044..37bce07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2379,7 +2379,7 @@ public class WmsHqlPack { - /** + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2388,22 +2388,25 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); + DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); -// DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - + DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result); + + DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result); + DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRoutingRule, result); return result; From 0fa1ffa23b009535522db781bc3e80169797353b Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Wed, 9 Oct 2019 09:17:54 +0800 Subject: [PATCH 23/28] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index 0b9f58c..af87b92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") + + private Integer forProduct; - + @Transient + @ApiParam(value = "补货规则列表") + List replenishList; + @Transient + @ApiParam(value = "推动规则列表补") + List promotionList; - public WmsRouting(){} + public WmsRouting() { + } } From 4ac7bae38bc3530ea1e43697847935de0467a40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Oct 2019 09:18:05 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E6=96=B0=E5=A2=9Ehql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index b6cafeb..6dc696d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2408,4 +2408,21 @@ public class WmsHqlPack { return result; } + + /** + * 接口映射分页查询条件 + * + * @param wmsPrinterConfigure + * @return + */ + public static DdlPackBean packHqlWmsPrinterConfigure(WmsPrinterConfigure wmsPrinterConfigure) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getIp(), "ip", result); + DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getPrinterNo(), "printerNo", result); + + getStringBuilderPack(wmsPrinterConfigure, result); + + return result; + } } From 4eada1c3430971e9f4e701225b2751e325820510 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 9 Oct 2019 10:53:37 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index ee94479..069b395 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -55,6 +55,10 @@ public class MesEquipment extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Column(name="CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + @Transient @ApiParam(value ="名称") private String name; From 95f156adf4a9420396d0f2e9254c16a04a65ab24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Oct 2019 11:00:30 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E6=89=80=E6=9C=89double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=B1=9E=E6=80=A7=E9=83=BD=E8=A6=81=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E7=B2=BE=E5=BA=A6=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BAdouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 2 +- .../i3plus/pojo/wms/bean/AmpStockCurrent.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 4 +- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 +- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- .../i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 4 +- .../pojo/wms/bean/WmsDocMovementDetails.java | 12 ++-- .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 2 +- .../i3plus/pojo/wms/bean/WmsLineLocatePart.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 77 +++++++++++----------- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 6 +- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 12 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 10 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 8 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 2 +- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 2 +- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 4 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 18 ++--- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 4 +- .../estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 2 +- .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 6 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 18 ++--- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 2 +- 40 files changed, 143 insertions(+), 142 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index b236374..9efc5aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -42,7 +42,7 @@ public class AmpJisRec extends BaseBean{ @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index fd7a488..f5fde23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -42,7 +42,7 @@ public class AmpStockCurrent extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 612276b..250b6a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -46,7 +46,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("单位") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -75,7 +75,7 @@ public class SapDocFgSum extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 85dc1d4..0666d27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -45,7 +45,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -112,7 +112,7 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("供应商批次") public String vendorLotNo; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index cd708d3..dfdad1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -43,7 +43,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "计量单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量") private Double qty; @@ -59,7 +59,7 @@ public class WmsBom extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 6ecb5c0..263cc0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -40,7 +40,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam("计量单位") private String UNIT; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; @@ -56,7 +56,7 @@ public class WmsBomTotal extends BaseBean { @ApiParam(value = "子计量单位") private String itemUnit; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "子用量") private Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 421410e..9722217 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -61,7 +61,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("条码") public String sn; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "库存数量", example = "0") public Double qty; @@ -70,7 +70,7 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("单位") public String unit; - @Column(name="FACT_QTY") + @Column(name="FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实盘数量", example = "0") public Double factQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index d101b27..6461ae8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -44,7 +44,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index d4a9c99..f39695e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -66,11 +66,11 @@ public class WmsCheckFactRecord extends BaseBean { @ApiParam("备注") public String remark; - @Column(name="PLAN_QTY") + @Column(name="PLAN_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "应收数量", example = "0") public Double planQty; - @Column(name="CHECK_QTY") + @Column(name="CHECK_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "抽点数量", example = "0") public Double checkQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index f2c20af..79c7f34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -66,7 +66,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("BOM切换标识") public String bomUpdate; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -91,7 +91,7 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam("子计量单位") public String itemUnit; - @Column(name="ITEM_QTY") + @Column(name="ITEM_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子用量", example = "0") public Double itemQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index eb39fc2..7dc5ac8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -46,7 +46,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -83,7 +83,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目标库位代码") public String destLocateNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; @@ -119,22 +119,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "操作原因") private String remark; - @Column(name = "PICK_QTY") + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; - @Column(name = "OUT_QTY") + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已出库数量", example = "1") private Double outQty; - @Column(name = "REC_QTY") + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已收货数量", example = "1") private Double recQty; - @Column(name = "MOVE_QTY") + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "已移库数量", example = "1") private Double moveQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index e6ba0ab..d546d76 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -52,7 +52,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 301b0ad..89184cf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -46,7 +46,7 @@ public class WmsFGInStock extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 8db0703..afc6da3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -59,15 +59,15 @@ public class WmsLineLocatePart extends BaseBean { return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue(); } - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量") private Double pullQty; - @Column(name = "Max") + @Column(name = "Max", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值") private Double max; - @Column(name = "Min") + @Column(name = "Min", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值") private Double min; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index fad9c66..a7f54ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -77,7 +77,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "最大包装数量", example = "-1") private Integer maxPackageQty; - @Column(name = "MAX_PART_QTY") + @Column(name = "MAX_PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大零件数量", example = "-1") private Double maxPartQty; @@ -93,7 +93,7 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "箱数", example = "-1") private Integer boxQty; - @Column(name = "PART_QTY") + @Column(name = "PART_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "零件数", example = "-1") private Double partQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 7c10ba8..442a5c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -42,15 +42,15 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "PULL_QTY") + @Column(name = "PULL_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "拉动数量", example = "0") private Double pullQty; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最大值", example = "0") private Double max; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最小值", example = "0") private Double min; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 21a3c0b..0cd2e2f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_DETAILS", indexes = { +@Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "ORGANIZE_CODE") @@ -33,94 +33,94 @@ import javax.persistence.*; public class WmsMoveDetails extends BaseBean { private static final long serialVersionUID = -5898637337319011710L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam(value = "行号", example = "0") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - public Double getTransQty(){ + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; - public Double getRejectQty(){ + public Double getRejectQty() { return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REF_ITEM") + @Column(name = "REF_ITEM") @ApiParam("关联单据行号") public String refItem; /** * ASN,PO,SO */ - @Column(name="REF_TYPE") + @Column(name = "REF_TYPE") @ApiParam("关联单据类型") public String refType; - @Column(name="REF_SRC") + @Column(name = "REF_SRC") @ApiParam("关联单号") public String refSrc; @@ -150,7 +150,7 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public Integer lockVersion; @Transient @ApiParam(value = "快照时间") @@ -200,20 +200,21 @@ public class WmsMoveDetails extends BaseBean { return fPartName; }*/ - public WmsMoveDetails(){} + public WmsMoveDetails() { + } - public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ + public WmsMoveDetails(String partNo, Long waitingCounts, Long finishedCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; } - public WmsMoveDetails(String partNo, double transQty){ + public WmsMoveDetails(String partNo, double transQty) { this.partNo = partNo; this.transQty = transQty; } - public WmsMoveDetails(String orderNo){ + public WmsMoveDetails(String orderNo) { this.orderNo = orderNo; } @@ -225,8 +226,8 @@ public class WmsMoveDetails extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty, - String createDateTime,String sn,String srcZoneNo){ + public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, + String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -241,11 +242,11 @@ public class WmsMoveDetails extends BaseBean { } - public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode - ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, - String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, - String createUser,String createDatetime,String modifyUser,String modifyDatetime){ + public WmsMoveDetails(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode + , String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo, + String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo, + Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode, + String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -269,7 +270,7 @@ public class WmsMoveDetails extends BaseBean { this.busiTypeCode = busiTypeCode; this.createUser = createUser; this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d743cbe..4ea1543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -83,7 +83,7 @@ public class WmsMoveSn extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -120,12 +120,12 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index a46cbea..66fbc2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -84,11 +84,11 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; @@ -142,7 +142,7 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单位") public String refUnit; - @Column(name="REF_QTY") + @Column(name="REF_QTY", columnDefinition = "decimal(18,8)") @ApiParam("关联数量") public Double refQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f84a315..3f3e2b6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -50,7 +50,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("行号") private Integer item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") private Double qty; @@ -67,28 +67,28 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("订单号") private String orderNo; - @Column(name = "PRINT_QTY") + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") private Double printQty; //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } - @Column(name = "RC_QTY") + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") private Double rcQty; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") private Double passQty; //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } - @Column(name = "NG_QTY") + @Column(name = "NG_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") private Double ngQty; @@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("状态") private Integer itemStatus; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam("标准包装") private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index bf51127..22dc007 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -41,11 +41,11 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameAdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam("数量") private Double qty; - @Column(name = "SID") + @Column(name = "SID", columnDefinition = "decimal(18,8)") @ApiParam("SID") private Double sId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c63c5fc..8af7dae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -74,7 +74,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "采购单位") private String buyUnit; - @Column(name = "BU2SU") + @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") private Double bu2su; @@ -82,11 +82,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "计价单位") private String priceUnit; - @Column(name = "PU2SU") + @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") private Double pu2su; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") private Double snp; @@ -95,11 +95,11 @@ public class WmsPart extends BaseBean { @ApiParam(value = "是否免检", example = "1") private Integer iqc; - @Column(name = "MIN") + @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") private Double min; - @Column(name = "MAX") + @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") private Double max; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 53a91f8..4aaec5c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -51,7 +51,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -84,7 +84,7 @@ public class WmsPoSn extends BaseBean { @ApiParam("组条码") public String groupNo; - @Column(name="REC_QTY") + @Column(name="REC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index d58d624..d0275ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -42,7 +42,7 @@ public class WmsQCDetails extends BaseBean { @ApiParam("行号") public String item; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -67,17 +67,17 @@ public class WmsQCDetails extends BaseBean { public String remark; - @Column(name = "FACT_QTY") + @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name = "PASS_QTY") + @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name = "REJECT_QTY") + @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 27f4a5a..f740e9c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -44,7 +44,7 @@ public class WmsShipping extends BaseBean { @ApiParam("物料名称") public String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 5639a23..8cd1f53 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -44,7 +44,7 @@ public class WmsSnOperateRecord extends BaseBean { @ApiParam(value = "库位代码") private String locateNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index 5fa795e..d48a771 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -61,7 +61,7 @@ public class WmsSnPrintRcd extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java index a26d449..001b0a6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java @@ -60,12 +60,12 @@ public class WmsStockInitialize extends BaseBean { @AnnoOutputColumn private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "可用数量", example = "0") @AnnoOutputColumn private Double qty = 0d; - @Column(name = "SNP") + @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标准包装", example = "1") @AnnoOutputColumn private Double snp; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index ffa452e..7ae45fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,47 +79,47 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 37201b2..8ccbb2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -109,7 +109,7 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 0a7ff59..d19ee0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -64,12 +64,12 @@ public class WmsTaskDetails extends BaseBean { @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; - @Column(name = "TRANS_QTY") + @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 5812f39..674df38 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -58,7 +58,7 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index a7d96c8..d5e6146 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -98,47 +98,47 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 45d366a..1e47d2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -58,7 +58,7 @@ public class WmsTransRcd extends BaseBean{ @ApiParam(value ="交易状态",example = "1") private Integer transStatus; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 7e066dd..447bdf9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -66,12 +66,12 @@ public class WmsTransSn extends BaseBean { @ApiParam("事务代码") public String transCode; - @Column(name="QTY") + @Column(name="QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 30bc5e6..03e877d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -37,7 +37,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "目标单位") private String destUnitCode; - @Column(name = "UNIT_COEFFICIENT") + @Column(name = "UNIT_COEFFICIENT", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率") private Double unitCoefficient; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 01b8aa1..40fdf34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -63,7 +63,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="TRANS_QTY") + @Column(name="TRANS_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "处理数量", example = "0") public Double transQty; @@ -71,7 +71,7 @@ public class WmsMoveDetailsSnapshot extends BaseBean { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - @Column(name="REJECT_QTY") + @Column(name="REJECT_QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "不合格处理数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 6f781aa..453d372 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -89,7 +89,7 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("容器编号") public String packAgeNo; - @Column(name = "SRC_QTY") + @Column(name = "SRC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -126,12 +126,12 @@ public class WmsMoveSnSnapshot extends BaseBean { @Transient private Long finishedCounts; - @Column(name = "DEST_QTY") + @Column(name = "DEST_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index f7e6aac..7b9e473 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -87,47 +87,47 @@ public class WmsStockQuanSnapshot extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "FAIL_QTY") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; - @Column(name = "HOLD_QTY") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; - @Column(name = "QC_QTY") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; - @Column(name = "RIN_QTY") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; - @Column(name = "FREEZE_QTY") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; - @Column(name = "CONSIGN_QTY") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; - @Column(name = "LOCK_QTY") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 436d126..b13c8f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -116,7 +116,7 @@ public class WmsStockSnSnapshot extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ApiParam(value = "数量", example = "0") private Double qty = 0d; From 68b0058e1b5b5e97fab83a81ec03662eaf90662d Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Wed, 9 Oct 2019 11:35:50 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a39b0e4..0294208 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -393,7 +393,67 @@ public class CommonEnumUtil { return tmp; } } + /** + * 数据类型 + * 1库存移动数据 + * 2质检数据 + * 3已配料待出库 + * 4JIS发运扣减 + * 5报工待汇总 + * 6报工汇总待处理 + * 7erp接口待同步 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NUM_TYPE { + MOVE_DETAILS(1, "MOVE_DETAILS", "库存移动数据"), + QC_DETAILS(2, "QC_DETAILS", "质检数据"), + DOC_MOVEMENT(3, "DOC_MOVEMENT", "已配料待出库"), + DOC_SHIPPING(4, "DOC_SHIPPING", "JIS发运扣减"), + FG_DETAILS(5, "FG_DETAILS", "报工待汇总"), + FG_SUM(6, "FG_SUM", "报工汇总待处理"), + ERP_INTERFACE(7, "ERP_INTERFACE", "ERP接口待同步"); + private int value; + private String code; + private String description; + + private NUM_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum USER_INFO_STATUS { INCUMBENT(1, "正常", "正常_NORMAL"), From 84a96a22fa3572c8c7b85232b46d9192a0b04afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 9 Oct 2019 12:01:28 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=96=B0=E5=8A=A0NotNumBiggerPackContain?= =?UTF-8?q?sZero=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 126 ++++++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 ++- 2 files changed, 78 insertions(+), 63 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index f249d04..f05d963 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; + import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; @@ -47,8 +48,8 @@ public class DdlPreparedPack { endDate += " 23:59:59"; } - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, startDate); - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, endDate); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate); } /** @@ -94,9 +95,9 @@ public class DdlPreparedPack { String[] time = date.split(","); if (time.length == 1) { //只有开始日期，没有结束日期 - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + time[0] + "%"); } else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) - || (time[1] != null & time[1].trim().length() > 0))) { + || (time[1] != null & time[1].trim().length() > 0))) { if (time[0] == null || time[0].trim().length() == 0) { time[0] = "1900-01-01"; } else { @@ -113,16 +114,16 @@ public class DdlPreparedPack { if (isShowTime && time[1].trim().length() <= 11) { time[1] += " 23:59:59"; } - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, time[0]); - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, time[1]); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, time[0]); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, time[1]); } else { if (showTaday) { if (isShowTime) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today + " 00:00:00"); - packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_"+ columnName, today + " 23:59:59"); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today + " 00:00:00"); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today + " 23:59:59"); } else { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, today); - packBean.addColumnQuery("s_" + columnName," and model." + columnName + " <= :m_s_" + columnName, today); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, today); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, today); } } } @@ -147,14 +148,14 @@ public class DdlPreparedPack { } if (!isShowTime) { date = date.substring(0, 10); - packBean.addColumnQuery(null," and '" + date + "' between substring(model." + startColumnName - + ",1,10) and substring(model." + endColumnName + ",1,10)", null); + packBean.addColumnQuery(null, " and '" + date + "' between substring(model." + startColumnName + + ",1,10) and substring(model." + endColumnName + ",1,10)", null); return; } else if (date.trim().length() <= 11) { date += " 00:00:00"; } - packBean.addColumnQuery(null," and '" + date + "' between model." + startColumnName - + " and model." + endColumnName, null); + packBean.addColumnQuery(null, " and '" + date + "' between model." + startColumnName + + " and model." + endColumnName, null); } /** @@ -173,9 +174,9 @@ public class DdlPreparedPack { } else { order[i] = "desc"; } - if(columnName[i].indexOf(" model.") == -1){ + if (columnName[i].indexOf(" model.") == -1) { sqlStr += " model." + columnName[i]; - }else{ + } else { sqlStr += columnName[i]; } sqlStr += " " + order[i].toString() + ","; @@ -209,7 +210,7 @@ public class DdlPreparedPack { */ public static void getStringLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val + "%"); } } @@ -222,7 +223,7 @@ public class DdlPreparedPack { */ public static void getStringLikerPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " like :m_" + columnName, "%" + val + "%"); + packBean.addColumnQuery(columnName, " or model." + columnName + " like :m_" + columnName, "%" + val + "%"); } } @@ -235,7 +236,7 @@ public class DdlPreparedPack { */ public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, val + "%"); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%"); } } @@ -248,7 +249,7 @@ public class DdlPreparedPack { */ public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " like :m_" + columnName, "%" + val); + packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val); } } @@ -260,7 +261,7 @@ public class DdlPreparedPack { */ public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, val); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val); } } @@ -272,7 +273,7 @@ public class DdlPreparedPack { */ public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val); + packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, val); } } @@ -283,7 +284,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getStringNotNullPack(String columnName, DdlPackBean packBean) { - packBean.addColumnQuery(null," and model." + columnName + " is not null", null); + packBean.addColumnQuery(null, " and model." + columnName + " is not null", null); } /** @@ -294,7 +295,7 @@ public class DdlPreparedPack { */ public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val); + packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val); } } @@ -306,7 +307,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Long.parseLong(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -318,7 +319,7 @@ public class DdlPreparedPack { */ public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -330,7 +331,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPackOr(Object data, String columnName, DdlPackBean packBean) { if (data != null && Long.parseLong(data.toString()) > 0) { - packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, data); } } @@ -342,7 +343,7 @@ public class DdlPreparedPack { */ public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -354,7 +355,7 @@ public class DdlPreparedPack { */ public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) >= 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, data); } } @@ -366,7 +367,7 @@ public class DdlPreparedPack { */ public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); } } @@ -390,7 +391,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, data); } } @@ -402,7 +403,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data); + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, data); } } @@ -414,9 +415,22 @@ public class DdlPreparedPack { */ public static void getNumberBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data); } } + + /** + * 封装double对象成大于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data); + } + } + /** * 封装double对象成大于等于语句 * @@ -425,7 +439,7 @@ public class DdlPreparedPack { */ public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data); } } @@ -437,9 +451,10 @@ public class DdlPreparedPack { */ public static void getNumberSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data); } } + /** * 封装double对象成小于等于语句 * @@ -448,7 +463,7 @@ public class DdlPreparedPack { */ public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && Double.parseDouble(data.toString()) > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data); } } @@ -460,7 +475,7 @@ public class DdlPreparedPack { */ public static void getNumNOEqualPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, data); + packBean.addColumnQuery(columnName, " and model." + columnName + " <> :m_" + columnName, data); } } @@ -473,7 +488,7 @@ public class DdlPreparedPack { */ public static void getInPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -486,7 +501,7 @@ public class DdlPreparedPack { */ public static void getOrInPack(String data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -499,7 +514,7 @@ public class DdlPreparedPack { */ public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -512,7 +527,7 @@ public class DdlPreparedPack { */ public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) { if (data != null && data.length > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); + packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); } } @@ -525,7 +540,7 @@ public class DdlPreparedPack { */ public static void getInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -538,7 +553,7 @@ public class DdlPreparedPack { */ public static void getNotInPackList(List data, String columnName, DdlPackBean packBean) { if (data != null && data.size() > 0) { - packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data); } } @@ -564,7 +579,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " or model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -590,7 +605,7 @@ public class DdlPreparedPack { data += "'" + dataArray[i] + "',"; } } - packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data); } } @@ -603,26 +618,27 @@ public class DdlPreparedPack { */ public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) { if (data != null) { - packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); + packBean.addColumnQuery(columnName, " and " + columnName + " not in (:m_" + columnName + ")", data); } } /** * 转换排序列 + * * @param columnName 列名 - * @param basisType 基本类型 - * @see CommonEnumUtil.BASIS_TYPE + * @param basisType 基本类型 * @return + * @see CommonEnumUtil.BASIS_TYPE */ - public static String getOrderColConvertType(String columnName,int basisType){ - String name =" model." + columnName; + public static String getOrderColConvertType(String columnName, int basisType) { + String name = " model." + columnName; if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) { - name = " cast(" + name+ " as integer)"; - } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()){ - name = " cast(" + name+ " as double)"; - } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()){ - name = " cast(" + name+ " as long)"; + name = " cast(" + name + " as integer)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) { + name = " cast(" + name + " as double)"; + } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) { + name = " cast(" + name + " as long)"; } return name; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4ede912..ed8a060 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2273,7 +2273,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "qty", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); @@ -2372,8 +2372,7 @@ public class WmsHqlPack { } - - /** + /** * 业务：库存查询封装 * * @param wmsStockQuan @@ -2382,23 +2381,23 @@ public class WmsHqlPack { public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); - // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); + // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); return result; } - + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); DdlPreparedPack.getStringEqualPack(wmsRoutingRule.getRoutingCode(), "routingCode", result); - + DdlPreparedPack.getInPack(wmsRoutingRule.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRoutingRule.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRoutingRule, result);