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

yun-zuoyi
钮海涛 6 years ago
commit d187f8b3e1

@ -211,9 +211,10 @@ public class AndonEnumUtil {
SIGN(2,"20","响应"),
RESOLVE(3,"30","解决"),
CANCEL(4,"40", "撤销"),
COMMIT(5,"50","提交"),
PASS(6,"60","审批"),
REJECT(7,"70","驳回");
COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
REJECT(7,"70","驳回"),
CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举
private int value;
private String code;
@ -245,6 +246,16 @@ public class AndonEnumUtil {
return tmp;
}
public static String codeOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descriptionOfValue(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {

@ -20,12 +20,12 @@ public class BlockSoftSwitchEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CASE_TYPE{
SOCKET(10,"SOCKET"),
RESTFUL(20,"RESTFUL"),
DATASOURCE(30,"数据源"),
WEB_SERVICE(40,"WebService"),
MQ(50,"消息队列"),
WEB_SOCKET(60,"WebSocket");
SOCKET(10,"SOCKET套件"),
RESTFUL(20,"RESTFUL套件"),
DATASOURCE(30,"数据源套件"),
WEB_SERVICE(40,"WebService套件"),
MQ(50,"消息队列套件"),
WEB_SOCKET(60,"WebSocket套件");
private int value;
private String description;
@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil {
SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
/* 数据源 */
CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* MesWorkOrderapprovalStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_APPROVAL_STATUS {
WAIT_APPROVAL(10, "待审批"),
COMPLETE_APPROVAL(20, "已审批"),
REJECT_APPROVAL(30, "驳回");
private int value;
private String description;
WORK_ORDER_APPROVAL_STATUS(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;
}
}
/**
* mes-pcn
*
*/
@ -459,6 +496,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**

@ -422,6 +422,15 @@ public class WmsEnumUtil {
return tmp;
}
public static LOCATE_TYPE codeOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1879,7 +1888,8 @@ public class WmsEnumUtil {
ZONE(20, "ZONE", "存储区对象"),
LOCATE(30, "LOCATE", "库位对象"),
MATERIAL(40, "MATERIAL", "物料对象"),
TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象");
private String code;
private String description;

@ -25,7 +25,7 @@ public class HqlPack {
return data.toString().replaceAll(";","")
.replaceAll("'","")
.replaceAll("\"","")
.replaceAll("/","")
// .replaceAll("/","")
.replaceAll("\\\\","")
.replaceAll("delete","")
.replaceAll("update","")

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED")
@Api("工位投料信息")
public class MesCellFeed extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("特殊批次")
private Long rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -34,6 +34,18 @@ public class MesProcessBom extends BaseBean {
@ApiParam("零件号")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@ -55,6 +67,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否检查")
private Integer isCheck;
@Column(name = "IS_FEED")
@ApiParam(value = "是否检查")
private Integer isFeed;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;
@ -80,6 +96,10 @@ public class MesProcessBom extends BaseBean {
return this.isBind == null ? false : this.isBind;
}
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}
@Override
public String toString() {
return "MesProcessBom{" +
@ -89,6 +109,7 @@ public class MesProcessBom extends BaseBean {
", qty=" + qty +
", isRepeat=" + isRepeat +
", isCheck=" + isCheck +
", isFeed=" + isFeed +
", isBind=" + isBind +
", color='" + color + '\'' +
", id=" + id +

@ -25,20 +25,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROD_BIND_RECORD")
@Table(name = "MES_PROD_BIND_RECORD")
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam(value = "产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("产品条码零件号")
private String partNo;
@Column(name="WORK_ORDER")
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrder;
private String workOrderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
@ -52,11 +52,11 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "工步代码")
private String stepCode;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料零件号")
private String itemPartNo;
@Column(name="KP_SN")
@Column(name = "KP_SN")
@ApiParam("原材料条码")
private String kpSn;
@ -65,11 +65,19 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "原材料数量", example = "0")
private Double kpQty;
@Column(name="SUPPLIER_CODE")
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商")
private String supplierCode;
@Column(name="VERSION")
@Column(name = "LOT_NO")
@ApiParam
private String lotNo;
@Column(name = "IS_FEED")
@ApiParam
private Integer isFeed;
@Column(name = "VERSION")
@ApiParam("版本")
private String version;
@ -77,6 +85,10 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "结果")
private String result;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}
public double getQtyVal() {
return this.kpQty == null ? 0.0d : this.kpQty;
}

@ -0,0 +1,75 @@
package cn.estsh.i3plus.pojo.mes.pcn.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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_RAW_PART_SN")
@Api("原材料信息")
public class MesRawPartSn extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("数量")
private Long rawQty;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name = "STATUS")
@ApiParam("原料状态")
private Integer status;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}
}

@ -0,0 +1,37 @@
package cn.estsh.i3plus.pojo.mes.pcn.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: wangjie
* @CreateDate:2019-09-18-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT_GROUP")
@Api("班组")
public class MesShiftGroup extends BaseBean {
@Column(name="GROUP_CODE")
@ApiParam("班组代码")
private String groupCode;
@Column(name="GROUP_NAME")
@ApiParam("班组名称")
private String groupName;
}

@ -88,7 +88,7 @@ public class MesWorkOrder extends BaseBean {
private String scheduleDate;
@Column(name="CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="SHIFT_CODE")
@ -111,6 +111,14 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name="SHIFT_GROUP")
@ApiParam("班组")
private String shiftGroup;
@Column(name="APPROVAL_STATUS")
@ApiParam("审批状态")
private Integer approvalStatus;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -138,4 +146,8 @@ public class MesWorkOrder extends BaseBean {
public int getWorkOrderTypeVal() {
return this.workOrderType == null ? 0 : this.workOrderType;
}
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
}

@ -0,0 +1,72 @@
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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED")
@Api("工位投料信息")
public class MesCellFeed extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name = "RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name = "RAW_QTY")
@ApiParam("特殊批次")
private Long rawQty;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
}

@ -95,7 +95,16 @@ public class MesPlanOrder extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="区域")
public String areaCode;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
@ -118,21 +127,6 @@ public class MesPlanOrder extends BaseBean {
@ApiParam(value="计划结束日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
public String endTimeEnd;
@Transient
public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
@Transient
public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
@Transient
public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
}
public List<MesEnumUtil.PLAN_ORDER_STATUS> getPlanOrderStatusEnum() {
return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values());
}
public double getPlanQtyVal() {
return this.planQty == null ? 0.0d : this.planQty;
}

@ -29,18 +29,31 @@ import java.util.Date;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROCESS_BOM")
@Table(name = "MES_PROCESS_BOM")
@Api("工序物料清单")
public class MesProcessBom extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="PROCESS_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("子零件")
private String itemPartNo;
@ -57,6 +70,11 @@ public class MesProcessBom extends BaseBean {
@ApiParam(value = "是否检查")
private Integer isCheck;
@Column(name = "IS_FEED")
@ApiParam(value = "是否检查")
private Integer isFeed;
@Transient
@ApiParam("是否已绑定")
private Boolean isBind;
@ -71,13 +89,17 @@ public class MesProcessBom extends BaseBean {
}
public int getIsRepeatVal() {
return this.isRepeat == null ? 0 : this.isRepeat;
return this.isRepeat == null ? 0 : this.isRepeat;
}
public int getIsCheckVal() {
return this.isCheck == null ? 0 : this.isCheck;
}
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}
public boolean getIsBindVal() {
return this.isBind == null ? false : this.isBind;
}
@ -91,6 +113,7 @@ public class MesProcessBom extends BaseBean {
", qty=" + qty +
", isRepeat=" + isRepeat +
", isCheck=" + isCheck +
", isFeed=" + isFeed +
", isBind=" + isBind +
", color='" + color + '\'' +
", id=" + id +

@ -26,20 +26,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_PROD_BIND_RECORD")
@Table(name = "MES_PROD_BIND_RECORD")
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
@Column(name = "SERIAL_NUMBER")
@ApiParam(value = "产品条码")
private String serialNumber;
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("产品条码零件号")
private String partNo;
@Column(name="WORK_ORDER")
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrder;
private String workOrderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
@ -53,11 +53,11 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "工步代码")
private String stepCode;
@Column(name="ITEM_PART_NO")
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料零件号")
private String itemPartNo;
@Column(name="KP_SN")
@Column(name = "KP_SN")
@ApiParam("原材料条码")
private String kpSn;
@ -66,11 +66,19 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "原材料数量", example = "0")
private Double kpQty;
@Column(name="SUPPLIER_CODE")
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商")
private String supplierCode;
@Column(name="VERSION")
@Column(name = "LOT_NO")
@ApiParam
private String lotNo;
@Column(name = "IS_FEED")
@ApiParam
private Integer isFeed;
@Column(name = "VERSION")
@ApiParam("版本")
private String version;
@ -78,6 +86,10 @@ public class MesProdBindRecord extends BaseBean {
@ApiParam(value = "结果")
private String result;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;
}
public double getQtyVal() {
return this.kpQty == null ? 0.0d : this.kpQty;
}

@ -0,0 +1,75 @@
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 :mes
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-12
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_RAW_PART_SN")
@Api("原材料信息")
public class MesRawPartSn extends BaseBean {
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name="RAW_TYPE")
@ApiParam("原料类型")
private String rawType;
@Column(name="RAW_SN")
@ApiParam("原材料条码")
private String rawSn;
@Column(name="RAW_QTY")
@ApiParam("数量")
private Long rawQty;
@Column(name="LOT_NO")
@ApiParam("生产批次")
private String lotNo;
@Column(name="FIX_LOT_NO")
@ApiParam("特殊批次")
private String fixLotNo;
@Column(name="STATUS")
@ApiParam("原料状态")
private Integer status;
@Column(name="SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
public long getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}
}

@ -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: wangjie
* @CreateDate:2019-09-18-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT_GROUP")
@Api("班组")
public class MesShiftGroup extends BaseBean {
@Column(name="GROUP_CODE")
@ApiParam("班组代码")
private String groupCode;
@Column(name="GROUP_NAME")
@ApiParam("班组名称")
private String groupName;
}

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -102,7 +101,7 @@ public class MesWorkOrder extends BaseBean {
private String scheduleDate;
@Column(name="CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name="SHIFT_CODE")
@ -125,6 +124,14 @@ public class MesWorkOrder extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name="SHIFT_GROUP")
@ApiParam("班组")
private String shiftGroup;
@Column(name="APPROVAL_STATUS")
@ApiParam("审批状态")
private Integer approvalStatus;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value="工作中心名称")
@ -167,31 +174,6 @@ public class MesWorkOrder extends BaseBean {
@ApiParam(value="计划结束日期查询用,查询结束日期截至",example = "2018-12-31 23:59:59")
public String endTimeEnd;
@Transient
@ApiParam("工单类型枚举")
private List<MesEnumUtil.WORK_ORDER_TYPE> workOrderTypeDropData;
public List<MesEnumUtil.WORK_ORDER_TYPE> getWorkOrderTypeDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values());
}
@Transient
@ApiParam("工单状态枚举")
private List<MesEnumUtil.WORK_ORDER_STATUS> workOrderStatusDropData;
public List<MesEnumUtil.WORK_ORDER_STATUS> getWorkOrderStatusDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values());
}
@Transient
@ApiParam("工单来源枚举")
private List<MesEnumUtil.WORK_ORDER_SOURCE> workOrderSourceDropData;
public List<MesEnumUtil.WORK_ORDER_SOURCE> getWorkOrderSourceDropData() {
return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
}
@Transient
@ApiParam("mes生产工单页面按钮控制")
private MesWorkOrderButtonModel workOrderButtonModel;
@ -224,4 +206,8 @@ public class MesWorkOrder extends BaseBean {
public int getWorkOrderTypeVal() {
return this.workOrderType == null ? 0 : this.workOrderType;
}
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
}

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author: wangjie
* @CreateDate: 2019/8/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入异常结果model")
public class MesExcelErrorModel implements Serializable {
@ApiParam("错误的行号")
private int rowNum;
@ApiParam("错误数量")
private int errorNum;
@ApiParam("错误列号")
private String cellNum;
@ApiParam("错误描述")
private String errorInfo;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @Author: wangjie
* @CreateDate: 2019/8/21 9:19 AM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes导入结果model")
public class MesExcelResultModel<T> implements Serializable {
@ApiParam("结果")
private boolean result;
@ApiParam("成功行数量")
private int successRowNum;
@ApiParam("失败行数量")
private int failRowNum;
@ApiParam("错误信息集合")
private List<MesExcelErrorModel> mesExcelErrorModel;
@ApiParam("错误的行号")
private String errorRows;
@ApiParam("导入数据集合")
private List<T> excelList;
}

@ -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.MesShiftGroup;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: wangjie
* @CreateDate:2019-09-18-17:13
* @Modify:
**/
@Repository
public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
}

@ -77,6 +77,9 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
}
if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
}
// 时间段查询
DdlPreparedPack.timeBuilder(
@ -718,16 +721,19 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
if (StringUtils.isNotEmpty(processBom.getPartNo())) {
DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
}
if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
}
DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
return packBean;
}
public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
return packBean;
}
@ -1177,6 +1183,7 @@ public class MesHqlPack {
/**
*
*
* @param organizeCode
* @return
*/

@ -1,16 +1,14 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.HashMap;
/**
* @Description :
* @Reference :
@ -41,6 +39,11 @@ public class SuitClientModel {
private BsSuitCaseModel suitCaseModel;
/**
*
*/
private BsSuitRecord bsSuitRecord;
/**
*
*/
private String suitMessage;
@ -53,6 +56,13 @@ public class SuitClientModel {
*
*/
private Integer suitMethodId;
public int getSuitMethodIdVal(){
if(suitMethodId == null){
return -1;
}
return suitMethodId.intValue();
}
/**
*
*/
@ -97,4 +107,21 @@ public class SuitClientModel {
// 设置默认
this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) {
this.requestSource = requestSource;
this.suitMethodId = suitMethodId;
this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
this.suitCaseModel = suitCaseModel;
// 设置默认
this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
// 设置默认
this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
// 设置默认
this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
}

@ -1,11 +1,14 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable {
@ApiParam(value = "移库单主表")
public WmsDocMovementMaster movementMaster;
@ApiParam(value = "状态")
@Transient
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer orderStatus;
@ApiParam(value = "供应商名称")
@Transient
public String vendorName;
@ApiParam(value = "供应商编码")
@Transient
public String vendorNo;
@ApiParam(value = "客户编码")
@Transient
public String custNo;
@ApiParam(value = "ERP编号")
@Transient
public String erpSrcNo;
@ApiParam(value = "联系人")
@Transient
public String vendorOwner;
@ApiParam(value = "供应商邮箱")
@Transient
public String vendorEmail;
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();

@ -74,7 +74,7 @@ public class SysMenu extends BaseBean {
@Column(name="MENU_SORT")
@ApiParam(value ="资源排序", example = "0")
@AnnoOutputColumn(required = false)
private Integer menuSort;
private Integer menuSort = 0;
@Column(name="MENU_URL")
@ApiParam(value ="资源 url" , access ="资源 url")

@ -159,7 +159,7 @@ public class CoreHqlPack {
// String Like
DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
// Number In
DdlPreparedPack.getInPackList(idList,"id",result);
return result;

@ -108,22 +108,96 @@ public class BsSuitCase extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long sslKeyId;
@Column(name = "TIMING_SUIT_NUM")
@Column(name = "REGULAR_SUIT_NUM")
@ApiParam(value = "定时适配次数")
private Integer timingSuitNum;
private Integer regularSuitNum;
public int getRegularSuitNumVal(){
if(regularSuitNum == null){
return -1;
}
return regularSuitNum.intValue();
}
public int addRegularSuitNum(){
if(regularSuitNum == null){
return 0;
}
return ++regularSuitNum;
}
@Column(name = "INITIATIVE_SUIT_NUM")
@ApiParam(value = "主动适配测试")
private Integer initiativeSuitNum;
public int getInitiativeSuitNumVal(){
if(initiativeSuitNum == null){
return -1;
}
return initiativeSuitNum.intValue();
}
public int addInitiativeSuitNum(){
if(initiativeSuitNum == null){
initiativeSuitNum = 0;
}
return ++regularSuitNum;
}
@Column(name = "SUCCESS_NUM")
@ApiParam(value = "成功次数")
private Integer successNum;
public int getSuccessNumVal(){
if(successNum == null){
successNum = -1;
}
return successNum.intValue();
}
public int addSuccessNum(){
if(successNum == null){
successNum = 0;
}
return ++successNum;
}
@Column(name = "FAIL_NUM")
@ApiParam(value = "失败次数")
private Integer failNum;
public int getFailNumVal(){
if(failNum == null){
return -1;
}
return failNum;
}
public int addFailNum(){
if(failNum == null){
failNum =0;
}
return ++failNum;
}
@Column(name = "COUNT_NUM")
@ApiParam(value = "总次数")
private Integer countNum;
public int getCountNumVal(){
if(countNum == null){
countNum = -1;
}
return countNum.intValue();
}
public int addCountNum(){
if(countNum == null){
countNum = 0;
}
return ++countNum;
}
@Column(name = "SUIT_CASE_DESCRIPTION")
@ApiParam(value = "适配器描述")
private String suitCaseDescription;

@ -42,6 +42,15 @@ public class BsSuitDataDetail extends BaseBean {
@ApiParam(value = "适配套件代码")
private String suitCaseCodeRdd;
@Column(name = "SUIT_TYPE_ID")
@ApiParam(value = "适配类型id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitTypeId;
@Column(name = "CASE_TYPE_ID")
@ApiParam(value = "套件类型id(枚举)")
private Integer caseTypeId;
@Column(name = "SUIT_TYPE_NAME_RDD")
@ApiParam(value = "适配类型名称")
private String suitTypeNameRdd;

@ -12,6 +12,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 :
@ -105,5 +107,17 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "处理时间")
private String processTime;
@Transient
@ApiParam(value = "适配记录参数")
private List<BsSuitRecordParam> bsSuitRecordParamList;
@Transient
@ApiParam(value = "适配记录报文")
private BsSuitDataDetail bsSuitDataDetail;
@Transient
@ApiParam(value = "适配请求记录")
private BsSuitRequestRecord bsSuitRequestRecord;
}

@ -1,9 +1,11 @@
package cn.estsh.i3plus.pojo.softswitch.sqlpack;
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;
/**
* @Description :
@ -101,7 +103,7 @@ public class SoftSwitchHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
return ddlPackBean;
}
@ -276,6 +278,10 @@ public class SoftSwitchHqlPack {
DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
bsSuitCaseDataSourceTable.setOrderByParam("operateSort");
bsSuitCaseDataSourceTable.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
ddlPackBean.setOrderByStr(bsSuitCaseDataSourceTable.orderBy());
return ddlPackBean;
}
@ -287,7 +293,7 @@ public class SoftSwitchHqlPack {
public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumNOEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
@ -313,6 +319,7 @@ public class SoftSwitchHqlPack {
public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
@ -332,8 +339,9 @@ public class SoftSwitchHqlPack {
public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);

@ -102,10 +102,25 @@ public class WmsLocate extends BaseBean {
@Transient
private String factory;
@Transient
@ApiParam(value = "入库箱数", example = "-1")
private Integer destBoxQty;
@Transient
@ApiParam(value = "错误信息", example = "-1")
private String errorMsg;
@Column(name = "ENCRYPTION_NO")
@ApiParam(value = "加密编码")
private String encryptionNo;
public WmsLocate() {
}
public WmsLocate(String locateNo,Integer destBoxQty) {
this.locateNo = locateNo;
this.destBoxQty = destBoxQty;
}
public Integer getMaxPackageQty() {
return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
}

@ -210,4 +210,7 @@ public class WmsMoveMaster extends BaseBean {
public Double getTransQty(){
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
public int getBusiTypeCodeVal(){
return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
}
}

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean {
*/
@Column(name = "PO_STATUS")
@ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer poStatus;
@Column(name = "VENDOR_NO")

@ -0,0 +1,45 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 11:50
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_PART_ROUTING")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="物料线路关系表",description = "物料线路关系表")
public class WmsPartRouting extends BaseBean {
private static final long serialVersionUID = 7759454799191378612L;
@Column(name = "PART_NO")
@ApiParam(value = "物料编号")
private String partNo;
@Column(name = "ROUTING_CODE")
@ApiParam(value = "线路编号")
private String areaNo;
public WmsPartRouting(){}
}

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 退
* @Reference :
* @author: amy.liu
* @date: 2019/9/17 17:10
* @Modify:
*/
@Data
@Api(value="生产退料导入模板",description = "生产退料导入模板")
public class WmsProductReturnMovement implements Serializable{
@ApiParam(value = "单号")
@AnnoOutputColumn
private String orderNo;
@ApiParam(value = "物料编码")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "数量")
@AnnoOutputColumn
private Double qty;
@ApiParam(value = "源存储区")
@AnnoOutputColumn
private String srcZoneNo;
@ApiParam(value = "目标存储区")
@AnnoOutputColumn
private String destZoneNo;
@ApiParam(value = "业务类型")
@AnnoOutputColumn
private String busiType;
@ApiParam(value = "工厂")
@AnnoOutputColumn
private String factory;
@ApiParam(value = "计划日期")
@AnnoOutputColumn
private String planDate;
@ApiParam(value = "计划时间")
@AnnoOutputColumn
private String planTime;
}

@ -0,0 +1,62 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 11:50
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_ROUTING")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="物流线路信息表",description = "物流线路信息表")
public class WmsRouting extends BaseBean {
private static final long serialVersionUID = 7759454799191378612L;
@Column(name = "ROUTING_CODE")
@ApiParam(value = "线路代码")
private String routingCode;
@Column(name = "ROUTING_NAME")
@ApiParam(value = "线路名称")
private String routingName;
@Column(name = "ROUTING_DESC")
@ApiParam(value = "线路描述")
private String routingDesc;
@Column(name = "FOR_PROUCT_CLASS")
@ApiParam(value = "适用产品分类")
private Integer forProductClass;
@Column(name = "FOR_WAREHOUSE")
@ApiParam(value = "适用仓库", example ="1")
private Integer forWareHouse;
@Column(name = "FOR_PRODUCT")
@ApiParam(value = "适用产品")
private Integer forProduct;
public WmsRouting(){}
}

@ -0,0 +1,85 @@
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;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 11:50
* @Modify:
**/
@Data
@Entity
@Table(name="WMS_ROUTING_RULE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="物流线路规则表",description = "物流线路规则表")
public class WmsRoutingRule extends BaseBean {
private static final long serialVersionUID = 7759454799191378612L;
@Column(name = "RULE_CODE")
@ApiParam(value = "规则编号")
private String ruleCode;
@Column(name = "RULE_NAME")
@ApiParam(value = "规则名称")
private String ruleName;
@Column(name = "RULE_DESC")
@ApiParam(value = "规则描述")
private String ruleDesc;
@Column(name = "SEQ")
@ApiParam(value = "排序号")
private Integer seq;
@Column(name = "RULE_TYPE")
@ApiParam(value = "规则类型(10 推动规则20 补货规则)", example ="10")
private Integer ruleType;
@Column(name = "ZONE_NO_SRC")
@ApiParam(value = "源存储区")
private String zoneNoSrc;
@Column(name = "ZONE_NO_TARGET")
@ApiParam(value = "目标存储区" , example = "2")
private String zoneNoTarget;
@Column(name = "OP_TYPE_CODE")
@ApiParam(value = "作业类型" , example = "2")
private String opTypeCode;
@Column(name = "TRANS_TYPE_CODE")
@ApiParam(value = "交易类型" , example = "1")
private String transTypeCode;
@Column(name = "MODE_CODE")
@ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作40:自动操作 无交易)" , example = "1")
private Integer modeCode;
@Column(name = "DELAY_TIME")
@ApiParam(value = "延迟时间" , example = "1")
private Integer dalayTime;
@Column(name = "DELAY_UNIT")
@ApiParam(value = "延迟时间单位(M:分钟D:天)")
private String delayUnit;
public WmsRoutingRule(){}
}

@ -0,0 +1,51 @@
package cn.estsh.i3plus.pojo.wms.engine.rule;
import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Description : VDA
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-09-17 19:50
* @Modify:
**/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GenerateLocateRule {
/**
*
*/
private List<String> zonesList;
/**
*
*/
private Integer locateType;
/**
*
*/
private String organizeCode;
/**
*
*/
private String locateNo;
/**
*
*/
private Integer destQty;
/**
*
*/
private String partNo;
}

@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean {
@ApiParam("交易代码列表")
private List<String> transTypeList;
@ApiParam("业务类型列表")
private List<String> busiTypeList;
@ApiParam(
value = "新增操作",
example = "0"

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsPartRouting;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 13:40
* @Modify:
**/
@Repository
public interface WmsPartRoutingRepository extends BaseRepository<WmsPartRouting ,Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsRouting;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 13:40
* @Modify:
**/
@Repository
public interface WmsRoutingRepository extends BaseRepository<WmsRouting ,Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule;
import org.springframework.stereotype.Repository;
/**
* @Description :()
* @Reference :
* @Author : hansen.ke
* @CreateDate : 2018-11-06 13:40
* @Modify:
**/
@Repository
public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
}
Loading…
Cancel
Save