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

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

Browse Source
yun-zuoyi
Silliter 6 years ago
parent cb6b06cb6a 2e9ed6a288
commit b9d013280f
27 changed files with 673 additions and 113 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,110 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @Description : sweb枚举类
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 20:21
* @Modify:
**/
public class SwebEnumUtil {
/**
* 单据主表状态(ASN,PO,MOVE,QC)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_MASTER_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "已发布"),
RECEIPT_FINISH(30, "已确认"),
CLOSED(40, "已打印"),
CANCELLED(50, "已发货");
private int value;
private String description;
ORDER_MASTER_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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 ORDER_DETAILS_STATUS {
CREATE(10, "新建"),
RECEIPT(20, "已发布"),
RECEIPT_FINISH(30, "已确认"),
CLOSED(40, "已打印"),
CANCELLED(50, "已发货");
private int value;
private String description;
ORDER_DETAILS_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
}

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

@ -1,73 +0,0 @@
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;
}

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

@ -17,7 +17,7 @@ import javax.persistence.Table;
* @Description :生产区域
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data

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

@ -0,0 +1,37 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROCESS")
@Api("工序")
public class MesProcess extends BaseBean {
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "PROCESS_NAME")
@ApiParam("工序名称")
private String processName;
}

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

@ -0,0 +1,41 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_ROUTE_CFG")
@Api("产品类流程配置表")
public class MesProdRouteCfg extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
}

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

@ -0,0 +1,57 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_ROUTE_OPT_PARAM")
@Api("产品流程配置操作参数表")
public class MesProdRouteOptParam extends BaseBean {
@Column(name = "PROD_ROUTE_CFG_ID")
@ApiParam("产品流程ID")
private Long prodRouteCfgId;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STEP_SEQ")
@ApiParam("工步顺序")
private Integer stepSeq;
@Column(name = "PARAM_CODE")
@ApiParam("工步参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam("工步参数值")
private String paramValue;
}

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

@ -0,0 +1,37 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ROUTE")
@Api("流程表")
public class MesRoute extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "ROUTE_NAME")
@ApiParam("流程名称")
private String routeName;
}

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

@ -0,0 +1,53 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ROUTE_PROCESS")
@Api("流程工序关系")
public class MesRouteProcess extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "NEXT_PROCESS")
@ApiParam("下一工序")
private String nextProcess;
@Column(name = "REPAIR_PROCESS")
@ApiParam("维修工序")
private String repairProcess;
@Column(name = "SEQ")
@ApiParam("顺序")
private Integer seq;
@Column(name = "IS_NECESSARY")
@ApiParam("是否必须")
private Integer isNecessary;
}

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

@ -0,0 +1,41 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ROUTE_PROCESS_CELL")
@Api("工序工作单元对照")
public class MesRouteProcessCell extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
}

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

@ -0,0 +1,53 @@
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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ROUTE_PROCESS_STEP")
@Api("流程工序工步关系")
public class MesRouteProcessStep extends BaseBean {
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STEP_SEQ")
@ApiParam("工步顺序")
private Integer stepSeq;
@Column(name = "PARAM_CODE")
@ApiParam("工步参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam("工步参数值")
private String paramValue;
}

49
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_STEP")
@Api("工步")
public class MesStep extends BaseBean {
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STEP_NAME")
@ApiParam("工步名称")
private String stepName;
@Column(name = "STEP_TEXT")
@ApiParam("工步描述")
private String stepText;
@Column(name = "STEP_TYPE")
@ApiParam("工步类型")
private String stepType;
@Column(name = "STEP_OBJECT")
@ApiParam("工步对象")
private String stepObject;
}

45
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.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
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_STEP_PARAM")
@Api("工步参数")
public class MesStepParam extends BaseBean {
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性")
private String paramAttribute;
}

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

@ -16,7 +16,7 @@ import javax.persistence.Table;
* @Description :工作单元
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data

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

@ -16,7 +16,7 @@ import javax.persistence.Table;
* @Description :工作中心
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02 15:58
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data

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

@ -1,14 +0,0 @@
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> {
}

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

@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository;
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository

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

@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository

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

@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository

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

@ -29,9 +29,13 @@ import javax.persistence.Table;
@Api("订单修改日志记录表")
public class SwebPurchaseChangeLog extends BaseBean {
@Column(name = "ORDER_ITEM_NO")
@Column(name = "ORDER_NO")
@ApiParam("单据明细编号")
public String orderItemNo;
public String orderNo;
@ApiParam(value = "零件号")
@Column(name = "PART_NO")
private String partNo;
@ApiParam(value = "订单当前状态")
@Column(name = "ITEM_STATUS")

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

@ -81,7 +81,7 @@ public class SwebPurchaseOrder extends BaseBean {
public String deliveryTime;
@Column(name = "REC_TIME")
@ApiParam(value = "交货时间")
@ApiParam(value = "收货时间")
public String recTime;
@Column(name = "IS_SYN")

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

@ -155,9 +155,9 @@ public class SwebPurchaseOrderDetails extends BaseBean {
@ApiParam(value = "行号", example = "0")
private Integer itemNo;
@Column(name = "COMFIRM_TIME")
@Column(name = "CONFIRM_TIME")
@ApiParam(value = "确认时间")
public String comfirmTime;
public String confirmTime;
@Column(name = "DELIVERY_TIME")
@ApiParam(value = "交货时间")

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

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 查看订单明细修改历史
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPODetailsUpdateHistoryModel extends BaseBean {
@ApiParam("单据号")
private String orderNo;
@ApiParam("供应商编号")
private String vendorCode;
@ApiParam(value = "零件号")
private String partNo;
@ApiParam(value = "零件名称")
private String partName;
@ApiParam(value = "订单数量")
private Double refQty;
@ApiParam(value = "确认到货数量")
private Double confirmQty;
@ApiParam(value = "变更列表")
private ListPager<SwebPurchaseChangeLog> history;
}

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

@ -0,0 +1,34 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 待发布订单列表输入模型
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPOForPubListEnterModel extends BaseBean {
@ApiParam("单据号")
private String orderNo;
@ApiParam("供应商编号")
private String vendorCode;
@ApiParam(value = "订单类型", example = "1")
public Integer orderType;
@ApiParam(value = "预计到货日期开始日期")
public String recTimeStart;
@ApiParam(value = "预计到货日期结束日期")
public String recTimeEnd;
@ApiParam(value = "零件号")
private String partNo;
}

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

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
import javax.persistence.Column;
import java.util.List;
import java.util.Map;
/**
* @Description : 待发布订单列表输出模型
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPOForPubListResultModel extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "零件名称")
private String partName;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@ApiParam(value = "订单状态", example = "1")
@Column(name = "ITEM_STATUS")
private Integer itemStatus;
@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
public Integer orderType;
@ApiParam(value = "时间数量列表", example = "1")
public List<Map<String,Double>> timeList;
}

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

@ -1,14 +0,0 @@
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 {
}

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

@ -30,7 +30,13 @@ public class SwebHqlPack {
}
// 封装有效状态和删除状态
SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
Integer isValid = bean.getIsValid();
//默认查有效数据
if (isValid != null && isValid != 0) {
SqlPack.getNumEqualPack(isValid, "isValid", hqlStr);
} else {
SqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", hqlStr);
}
SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr.toString();
}
@ -70,4 +76,10 @@ public class SwebHqlPack {
HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
return buildHql(vendorRel, result);
}
/*public static String getPurchaseOrderDetailsWhereHql(SwebPurchaseOrderDetails swebPurchaseOrderDetails) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(swebPurchaseOrderDetails.getOrderNo(), "orderNo", result);
return buildHql(swebPurchaseOrderDetails, result);
}*/
}

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

@ -27,6 +27,7 @@ public class WmsHqlPack {
public static String packInParams(String colnumName, String[] params) {
StringBuffer sb = new StringBuffer();
HqlPack.getInPackString(String.join(",", params), colnumName, sb);
HqlPack.getNumEqualPack( WmsEnumUtil.IS_PART.IS_ADJUST.getValue(),"snControl", sb);
return sb.toString();
}

Write Preview
Loading…
Cancel
Save