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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
amy 6 years ago
parent c1b477dd32 4093330dc3
commit fcc36ef7f6
20 changed files with 363 additions and 131 deletions
Show Stats Download Patch File Download Diff File

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

@ -80,7 +80,6 @@ public class WmsEnumUtil {
}
/**
* 主表信息 单据类型
*/
@ -584,60 +583,37 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"),
SO(30, "SO", "SO"),
MOVE(40, "MOVE", "MOVE"),
IN_STOCK(50, "IN_STOCK", "IN_STOCK"),
SHIPPING(60, "SHIPPING", "SHIPPING"),
QC(70, "QC", "QC"),
CS(80, "CS", "CS");
private int value;
private String code;
ASN("ASN", "ASN"),
PO("PO", "PO"),
SO("SO", "SO"),
MOVE("MOVE", "MOVE"),
IN_STOCK("IN_STOCK", "IN_STOCK"),
SHIPPING("SHIPPING", "SHIPPING"),
QC("QC", "QC"),
CS("CS", "CS");
private String value;
private String description;
LINK_ORDER_TYPE(int value, String code, String description) {
LINK_ORDER_TYPE(String value, 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;
return value;
}
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;
public String getValue() {
return value;
}
public static LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1;
public static LINK_ORDER_TYPE codeOf(String value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
if (values()[i].value.equals(value)) {
return values()[i];
}
}
@ -720,7 +696,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(10,"创建"),
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),

66
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
Unescape Escape View File

@ -1,66 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Entity
@Table(name="machine_factory")
@Api("工厂")
public class MachineFactory extends BaseBean {
@Column(name="factory_code")
@ApiParam("工厂代码")
private String factoryCode;
@Column(name="factory_name")
@ApiParam("工厂名称")
private String factoryName;
public MachineFactory() {
}
public MachineFactory(String factoryCode, String factoryName) {
this.factoryCode = factoryCode;
this.factoryName = factoryName;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
@Override
public String toString() {
return "MachineFactory{" +
"factoryCode='" + factoryCode + '\'' +
", factoryName='" + factoryName + '\'' +
", id=" + id +
", createDate='" + createDatetime + '\'' +
", modifyDate='" + modifyDatetime + '\'' +
'}';
}
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java
Unescape Escape View File

@ -1,20 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify::
**/
public class WorkPlan {
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}

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

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.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 : Adair Peng
* @CreateDate : 2019-03-21 13:14
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT")
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementInfoId;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectId;
@Column(name="ELEMENT_TYPE")
@ApiParam(value ="元素类型")
private Integer elementType;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@Column(name="ELEMENT_CODE")
@ApiParam(value ="元素编码")
private String elementCode;
@Column(name="ELEMENT_ATTR_ID")
@ApiParam(value ="默认排序属性")
private String elementAttrId;
@Column(name="ELEMENT_SORT_TYPE")
@ApiParam(value ="默认排序规则")
private String elementSortType;
@Column(name="ELEMENT_CSS_STYLE")
@ApiParam(value ="元素样式")
private String elementCssStyle;
@Column(name="ELEMENT_DESCRIPTION")
@ApiParam(value ="元素描述")
private String elementDescription;
}

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

@ -0,0 +1,38 @@
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;
/**
* @Description :生产区域
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

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

@ -0,0 +1,45 @@
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;
/**
* @Description :工作单元
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL")
@Api("工作单元")
public class MesWorkCell extends BaseBean {
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CELL_NAME")
@ApiParam("工作单元名称")
private String workCellName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

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

@ -0,0 +1,49 @@
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;
/**
* @Description :工作中心
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CENTER")
@Api("工作中心")
public class MesWorkCenter extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "ERP_WORK_CENTER")
@ApiParam("ERP工作中心")
private String erpWorkCenter;
@Column(name = "WORK_VER")
@ApiParam("工作版本")
private String workVer;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.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.BfElement;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementRepository extends BaseRepository<BfElement,Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCellRepository extends BaseRepository<MesWorkCell, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCenterRepository extends BaseRepository<MesWorkCenter, Long> {
}

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java
Unescape Escape View File

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -40,6 +41,7 @@ public class SwebPackage extends BaseBean {
@ApiParam("上级包装编号")
public String parentPackageNo;
@ColumnDefault("0")
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java
Unescape Escape View File

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -44,6 +45,7 @@ public class SwebProcurementPlanOrderDetails extends BaseBean {
@Column(name = "UNIT")
private String unit;
@ColumnDefault("0")
@ApiParam("标准包装")
@Column(name = "SNP_QTY")
private Double snpQty;

2
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java
Unescape Escape View File

@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -38,6 +39,7 @@ public class SwebPurchaseChangeLog extends BaseBean {
@Column(name = "QTY")
@ApiParam("零件数量")
@ColumnDefault("0")
public Double qty;
@Column(name = "REMARK")

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPurchaseForPubListModel {
}

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

@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.tool.SqlPack;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
import cn.estsh.i3plus.pojo.sweb.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
@ -18,11 +18,12 @@ public class SwebHqlPack {
/**
* 通用封装isValid、isDeleted等参数
*
* @param bean
* @param hqlStr
* @return
*/
private static String buildHql(BaseBean bean, StringBuffer hqlStr){
private static String buildHql(BaseBean bean, StringBuffer hqlStr) {
// 判断工厂代码是否为空
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
@ -34,11 +35,39 @@ public class SwebHqlPack {
return hqlStr.toString();
}
public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){
public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
return buildHql(purchaseOrder,result);
return buildHql(purchaseOrder, result);
}
public static String getPackAgeWhereHql(SwebPackage swebPackage) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
return buildHql(swebPackage, result);
}
public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
return buildHql(swebProcurementPlanOrder, result);
}
public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
public static String getVendorRelWhereHql(SwebVendorRel vendorRel) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
return buildHql(vendorRel, result);
}
}

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

@ -71,4 +71,16 @@ public class WmsDocMovementSn extends BaseBean {
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("目标库位代码")
public String destLocateNo;
@Transient
@ApiParam("源库位代码")
public String srcLocateNo;
@Transient
@ApiParam("生产日期")
public String dateCode;
}

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

@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty(){
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
public Double getRejectQty(){
return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
}
@Column(name="UNIT")
@ApiParam("单位")
public String unit;

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

@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean {
@Transient
public Double inputNCQty;
@ApiParam(value = "前端散件表格是否编辑")
@Transient
public Boolean isSet = false;
public WmsStockSn(){}
public WmsStockSn(String partNo){

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

@ -1033,7 +1033,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result);
//单号
HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
getStringBuilderPack(wmsQCMaster, result);

Write Preview
Loading…
Cancel
Save