I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent b00bcf66b2 00e27023c1
commit 9629823a79
14 changed files with 266 additions and 5 deletions
Show Stats Download Patch File Download Diff File

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -1816,7 +1816,8 @@ public class CommonEnumUtil {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
private int value;
private String code;
@ -1908,6 +1909,13 @@ public class CommonEnumUtil {
return tmp;
}
public String getSchemaPattern(String schema) {
if(this.equals(SOURCE_SAP_HANA)){
return schema;
}
return defaultSchemaPattern;
}
public String getJDBCUrl(String database,String host,Integer port){
if(this.getValue() == SOURCE_MARIA_DB.getValue()){
return getJDBCUrlMySQL(database,host,port);
@ -1917,6 +1925,8 @@ public class CommonEnumUtil {
return getJDBCUrlPostgreSQL(database,host,port);
}else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
return getJDBCUrlSQLServer(database,host,port);
}else if(this.getValue() == SOURCE_SAP_HANA.getValue()){
return getJDBCUrlSapHana(database,host,port);
}
return null;
}
@ -1944,6 +1954,8 @@ public class CommonEnumUtil {
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}else if(databaseProductName.indexOf(":sap:") != -1){
return SOURCE_SAP_HANA;
}
}
return null;
@ -1965,6 +1977,10 @@ public class CommonEnumUtil {
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
private String getJDBCUrlSapHana(String database,String host,Integer port){
return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
}
private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
StringBuffer sb = new StringBuffer();
sb.append("jdbc:sqlserver://").append(host);

118
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java
Unescape Escape View File

@ -0,0 +1,118 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
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;
import java.io.Serializable;
/**
* @Description : MES_看板麦格纳评定项
* @Reference :
* @Author : adair
* @CreateDate : 2020-10-19 17:19
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOARD_MAFACT_ASSESSMENT")
@Api("MES_看板麦格纳评定项")
public class MesBoardMafactAssessment extends BaseBean implements Serializable {
private static final long serialVersionUID = 7260899228359202210L;
@Column(name="BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name="ENG_ADV_QUALITY")
@ApiParam("ENG_ADV_QUALITY")
private String engAdvQuality;
@Column(name="MANAGEMENT")
@ApiParam("MANAGEMENT")
private String manageMent;
@Column(name="MAT_LOG_SUP")
@ApiParam("MAT_LOG_SUP")
private String matLogSup;
@Column(name="MFG_EXC")
@ApiParam("MFG_EXC")
private String mfgExc;
@Column(name="QUALITY")
@ApiParam("QUALITY")
private String quality;
@Column(name = "EHS")
@ApiParam("EHS")
private String ehs;
@Column(name = "COST")
@ApiParam("COST")
private String cost;
@Column(name = "HR")
@ApiParam("HR")
private String hr;
@Column(name = "JAN")
@ApiParam("JAN")
private String jan;
@Column(name = "FEB")
@ApiParam("FEB")
private String feb;
@Column(name = "MAR")
@ApiParam("MAR")
private String mar;
@Column(name = "APR")
@ApiParam("APR")
private String apr;
@Column(name = "MAY")
@ApiParam("MAY")
private String may;
@Column(name = "JUN")
@ApiParam("JUN")
private String jun;
@Column(name = "JUL")
@ApiParam("JUL")
private String jul;
@Column(name = "AUG")
@ApiParam("AUG")
private String aug;
@Column(name = "SEP")
@ApiParam("SEP")
private String sep;
@Column(name = "OCT")
@ApiParam("OCT")
private String oct;
@Column(name = "NOV")
@ApiParam("NOV")
private String nov;
@Column(name = "DEC")
@ApiParam("DEC")
private String dec;
}

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -170,6 +170,18 @@ public class MesPackage extends BaseBean implements Serializable {
public MesPackage() {
}
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
public double getQty2Val() {
return this.qty2 == null ? 0.0d : this.qty2;
}
public double getPackSpecQtyVal() {
return this.packSpecQty == null ? 0.0d : this.packSpecQty;
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
Unescape Escape View File

@ -217,6 +217,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
@Transient
@ApiParam("缺陷代码")
private String defectCode;
@Transient
@ApiParam("缺陷名称")
private String defectName;
@Transient
@ApiParam("维修状态")
private Integer repairStatus;
public MesProduceSn() {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMafactAssessmentRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardMafactAssessment;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\11\18 10:33
* @Modify:
**/
public interface MesBoardMafactAssessmentRepository extends BaseRepository<MesBoardMafactAssessment, Long> {
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -783,6 +783,8 @@ public class MesHqlPack {
DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode);
DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean);
return packBean;
}

27
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.sweb.bean.*;
import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
@ -66,6 +67,32 @@ public class SwebHqlPack {
return buildHql(purchaseOrder, result);
}
public static DdlPackBean getPurchaseOrderForSnPrintWhereHql(SwebPurchaseOrder purchaseOrder, List<String> vendorNos) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result);
if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) {
DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result);
} else {
DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
}
if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) {
DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
}
List<Integer> poStatus = new ArrayList<>();
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.SURE.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.PRINTED.getValue());
poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS.DELIVERY.getValue());
//poStatus.add(SwebEnumUtil.ORDER_MASTER_STATUS..getValue());
DdlPreparedPack.getInPackList(poStatus, "poStatus", result);
DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
return buildHql(purchaseOrder, result);
}
public static DdlPackBean getPackageWhereHql(SwebPackage swebPackage) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
Unescape Escape View File

@ -70,4 +70,9 @@ public class BasCustomer extends BaseBean {
@ApiParam(value = "传真")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String custFax;
@Column(name = "SAFETY_STOCK")
@ApiParam(value = "安全库存")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
private Double safetyStock;
}

26
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
Unescape Escape View File

@ -197,6 +197,20 @@ public class WmsDocFgDetail extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description")
private Integer productStatus;
@Column(name = "CURRENT_SEQ")
@ApiParam(value = "当前序号")
private Integer currentSeq;
@Column(name = "MAX_SEQ")
@ApiParam(value = "最大序号")
private Integer maxSeq;
@Column(name = "RC_TIME")
@ApiParam(value = "接收时间")
private String rcTime;
public WmsDocFgDetail(String jisNo) {
this.jisNo = jisNo;
@ -205,6 +219,18 @@ public class WmsDocFgDetail extends BaseBean {
public WmsDocFgDetail() {
}
public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) {
this.jisNo = jisNo;
this.queueGroupNo = queueGroupNo;
this.processTime = processTime;
}
public WmsDocFgDetail(String jisNo, String sn) {
this.jisNo = jisNo;
this.sn = sn;
}
public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) {
this.sn = sn;
this.mfgLocNo = mfgLocNo;

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -177,6 +177,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refSrc;
@Column(name = "REF_SN")
@ApiParam("关联条码")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String refSn;
@Column(name = "GROUP_NO")
@ApiParam("分组号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Unescape Escape View File

@ -10,7 +10,12 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
@ -187,8 +192,13 @@ public class WmsMoveMaster extends BaseBean {
@Transient
@ApiParam("交易类型集合")
private List<String> filterTransTypeCodeList;
@Transient
@ApiParam("交易类型集合")
private List<String> transTypeCodeList;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

9
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
Unescape Escape View File

@ -268,6 +268,10 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("委外收货时间")
public String rcDatetime;
@Transient
@ApiParam("条码数量")
public Integer snCount;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
@ -409,4 +413,9 @@ public class WmsMoveSn extends BaseBean {
this.transTypeName = transTypeName;
this.itemStatus = itemStatus;
}
public WmsMoveSn(Integer snCount, String createDatetime) {
this.snCount = snCount;
this.createDatetime = createDatetime;
}
}

7
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
Unescape Escape View File

@ -198,6 +198,10 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("结束时间")
private String planEndDate;
@Transient
@ApiParam("erp单号")
private String erpSrcNo;
/**
* 状态:1=新建,10=收货中,20=收货完成,
@ -274,9 +278,10 @@ public class WmsPOMasterDetails extends BaseBean {
this.qty = qty;
}
public WmsPOMasterDetails(String orderNo, String partNo, Double qty,
public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
Double rcQty, Integer itemStatus) {
this.orderNo = orderNo;
this.erpSrcNo = erpSrcNo;
this.partNo = partNo;
this.qty = qty;
this.rcQty = rcQty;

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
Unescape Escape View File

@ -221,10 +221,10 @@ public class WmsPart extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double proportion;
@Column(name = "STD_CHECK_TIME")
@Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)")
@ApiParam(value = "标准质检时间")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Integer stdCheckTime;
private Double stdCheckTime;
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")

Write Preview
Loading…
Cancel
Save