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

Merge remote-tracking branch 'remotes/origin/test'

Browse Source
yun-zuoyi
汪云昊 6 years ago
parent 7a28e0d088 bd28a7ac63
commit e0fb3198e8
23 changed files with 346 additions and 127 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
Unescape Escape View File

@ -115,7 +115,8 @@ public class DynamicEntity extends BaseBean implements Serializable {
Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
setMethod.invoke(this, val);
} catch (NoSuchMethodException e) {
LOGGER.error("没有方法：{}",setMethodName,e);
// LOGGER.error("没有方法：{}",setMethodName,e);
LOGGER.error("没有方法：{}",setMethodName);
} catch (IllegalAccessException e) {
LOGGER.error("入参出错：{}:{}",val,val.getClass(),e);
} catch (InvocationTargetException e) {

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

@ -1713,10 +1713,10 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_EVENT {
CLICK(10, "CLICK", "单击"),
DB_LCLICK(20, "DB_LCLICK", "双击"),
MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入");
CLICK(10, "CLICK", "单击");
// DB_LCLICK(20, "DB_LCLICK", "双击"),
// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
private int value;
private String code;

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

@ -95,7 +95,7 @@ public class WmsEnumUtil {
SUB(20, "SUB", "委外采购"),
TAR(30, "TAR", "多角贸易采购"),
TAP(40, "TAP", "多角代采购"),
AMP(50, "AMP", "AMP拉动");
AMP(50, "AMP", "AMP收货");
private int value;
private String code;
@ -2442,6 +2442,7 @@ public class WmsEnumUtil {
public enum IMPORT_ORDER_TYPE {
PO("PO", "要货计划"),
ASN("ASN", "ASN"),
INSTRUCTIONS("INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "零星出库指令"),
SCATTERED_INT("C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
@ -2764,6 +2765,61 @@ public class WmsEnumUtil {
}
/**
* 库存数量类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_QUAN_QTY_TYPE {
QTY("qty", "可用数量"),
FAIL_QTY("failQty", "不合格数量"),
HOLD_QTY("holdQty", "隔离数量"),
QC_QTY("qcQty", "质检中数量"),
RIN_QTY("rinQty", "待入库数量"),
FREEZE_QTY("freezeQty", "冻结数量"),
CONSIGN_QTY("consignQty", "寄售数量"),
LOCK_QTY("lockQty", "锁定数量"),
SCRAP_QTY("scrapQty", "报废数量");
private String value;
private String description;
STOCK_QUAN_QTY_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getDescription() {
return description;
}
public String getCode() {
return value;
}
public String getValue() {
return value;
}
public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(code)) {
return values()[i];
}
}
return null;
}
public static String getDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == code) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* ERP同步标识 10=待同步，20=同步成功，30=同步失败
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -56,7 +56,7 @@ public class BfElementProperty extends BaseBean {
private String propertyTypeNameRdd;
@Column(name="PROPERTY_NAME")
@ApiParam(value ="元素名称")
@ApiParam(value ="元素属性名称")
private String propertyName;
@Column(name="PROPERTY_CODE_RDD")
@ -137,6 +137,6 @@ public class BfElementProperty extends BaseBean {
private BfDataObjectProperty objectProperty;
public Object getFormValue() {
return propertyFormValue == null ? propertyDefaultValue: propertyFormValue;
return propertyFormValue;
}
}

8
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
Unescape Escape View File

@ -33,8 +33,8 @@ public class WmsTaskInfoModel implements Serializable {
@ApiParam("关联单号")
public String refSrc;
@ApiParam(value = "关联单据类型")
private String refType;
@ApiParam(value = "关联单据业务类型")
private String busiTypeDesc;
@Column(name = "ZDATE")
@ApiParam(value = "计划日期")
@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable {
}
public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
String refType, String zdate, String ztime, String custNo, String vendorNo) {
String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
this.orderNo = orderNo;
this.taskStatus = taskStatus;
this.opTypeName = opTypeName;
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
this.refType = refType;
this.busiTypeDesc = busiTypeDesc;
this.zdate = zdate;
this.ztime = ztime;
this.custNo = custNo;

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

@ -83,6 +83,13 @@ public class SysDictionary extends BaseBean {
@ApiParam(value = "是否默认",example = "2")
private Integer isDefault;
public int getIsDefaultVal(){
if(this.isDefault == null){
return 0;
}
return isDefault.intValue();
}
@Column(name="DICTIONARY_DESCRIPTION")
@ApiParam(value ="描述")
private String dictionaryDescription;

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

@ -40,10 +40,6 @@ public class SysRole extends BaseBean {
@ApiParam(value ="资源描述")
private String roleDescription;
@Column(name="ROLE_GRADE")
@ApiParam(value ="角色等级（待定）" , example ="-1")
private Integer roleGrade;
@Column(name="MODULE_NUMBER")
@ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
private Integer moduleNumber;

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
Unescape Escape View File

@ -9,9 +9,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -26,7 +27,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_EXCEPTION")
@Table(name="SYS_LOG_EXCEPTION",
indexes = {
@Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID")
}
)
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogException extends BaseBean {

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
Unescape Escape View File

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -29,7 +30,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_OPERATE")
@Table(name="SYS_LOG_OPERATE",
indexes = {
@Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"),
@Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE")
})
@Api(value="操作日志表",description = "操作日志表")
public class SysLogOperate extends BaseBean {

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
Unescape Escape View File

@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -29,7 +30,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_SYSTEM")
@Table(name="SYS_LOG_SYSTEM",
indexes = {
@Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"),
@Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID")
})
@Api(value="系统日志表",description = "系统日志表")
public class SysLogSystem extends BaseBean {

8
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
/**
@ -26,7 +27,12 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_TASK_TIME")
@Table(name="SYS_LOG_TASK_TIME",
indexes = {
@Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
@Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"),
@Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME")
})
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {

1
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -240,6 +240,7 @@ public class CoreHqlPack {
HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
}
HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
// 添加默认排序
HqlPack.getOrderDefault(dictionary);

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

@ -39,7 +39,7 @@ public class AmpPart extends BaseBean {
/**
* 状态：B汇总库存到AMP系统
*/
@Column(name = "ORDER_STATUS")
@Column(name = "status")
@ApiParam(value = "状态")
private String orderStatus;
private String status;
}

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

@ -64,6 +64,18 @@ public class BasVendor extends BaseBean{
@ApiParam(value = "密码")
private String password;
@Column(name = "VENDOR_CALL")
@ApiParam("供应商电话")
private String vendorCall;
@Column(name = "VENDOR_FAX")
@ApiParam("传真")
private String vendorFax;
@Column(name = "VENDOR_PHONE")
@ApiParam("手机")
private String vendorPhone;
public BasVendor() {
}

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

@ -109,4 +109,16 @@ public class WmsASNMaster extends BaseBean {
@Column(name = "REMARK")
@ApiParam("备注")
public String remark;
@Transient
@ApiParam("供应商电话")
private String vendorCall;
@Transient
@ApiParam("传真")
private String vendorFax;
@Transient
@ApiParam("手机")
private String vendorPhone;
}

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

@ -64,8 +64,8 @@ public class WmsMoveToERP extends BaseBean {
private String carNo;
@Column(name="ITEM")
@ApiParam(value = "行号", example = "0")
public Integer item;
@ApiParam(value = "行号")
public String item;
@Column(name="PART_NO")
@ApiParam("物料编码")

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

@ -119,4 +119,16 @@ public class WmsPOMaster extends BaseBean {
@Transient
@ApiParam("邮箱")
private String vendorEmail;
@Transient
@ApiParam("供应商电话")
private String vendorCall;
@Transient
@ApiParam("传真")
private String vendorFax;
@Transient
@ApiParam("手机")
private String vendorPhone;
}

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

@ -5,6 +5,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import net.bytebuddy.implementation.bind.annotation.Default;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -88,6 +90,7 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "标准包装", example = "1")
private Double snp;
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "收货检验否", example = "1")
private Integer iqc;
@ -112,10 +115,22 @@ public class WmsPart extends BaseBean {
@ApiParam(value = "是否条码管理", example = "1")
private Integer snControl;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商代码")
private String vendorNo;
@Column(name = "IN_LOCATE_NO")
@ApiParam(value = "默认入库库位")
private String inLocateNo;
@Transient
@ApiParam("默认入库存储区")
private String inZoneNo;
@Transient
@ApiParam("默认入库仓库")
private String inWhNo;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@ -136,7 +151,9 @@ public class WmsPart extends BaseBean {
@ApiParam("库存水平")
private String stockLevelStatus;
public WmsPart(){}
public WmsPart() {
}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
this.partNo = partNo;
@ -145,4 +162,12 @@ public class WmsPart extends BaseBean {
this.min = minQty;
this.qty = cqty;
}
public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
this.partNo = partNo;
this.vendorNo = vendorNo;
this.inLocateNo = inLocateNo;
this.inZoneNo = inZoneNo;
this.inWhNo = inWhNo;
}
}

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

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.wms.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;
/**
* @Description SAP_单据锁定表
* @Reference
* @Author dragon
* @CreateDate 2019/6/29 18:04
* @Modify
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "SAP_ORDER_LOCK")
@Api("SAP_单据锁定")
public class WmsSapOrderLock extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("订单号")
public String orderNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public String busiType;
@Column(name = "ITEM")
@ApiParam("行号")
public String item;
@Column(name = "LOCK_FLAG")
@ApiParam("锁定标识")
public String lockFlag;
}

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

@ -134,6 +134,14 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("目的库存地代码")
public String destAreaNo;
@Column(name = "BUSI_TYPE")
@ApiParam("业务类型")
public Integer busiType;
@Column(name = "BUSI_TYPE_DESC")
@ApiParam("业务类型描述")
public String busiTypeDesc;
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock;
import org.springframework.stereotype.Repository;
/**
* @Description SAP_单据锁定 DAO层接口
* @Reference
* @Author dragon
* @CreateDate 2019/6/29 18:35
* @Modify
*/
@Repository
public interface WmsSapOrderLockRepository extends BaseRepository<WmsSapOrderLock, Long> {
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -247,7 +247,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
getStringBuilderPack(wmsPart, result);
@ -475,7 +475,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//客户编号
DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result);
DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
//客户简称
DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
//客户全称
@ -633,7 +633,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
@ -1412,7 +1412,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);

Write Preview
Loading…
Cancel
Save