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

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

Browse Source
yun-zuoyi
许心洁 4 years ago
parent 819a4312ae b32ee06811
commit 8c26a27218
9 changed files with 300 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -4231,6 +4231,7 @@ public class MesPcnEnumUtil {
public enum PRODUCE_ERROR_RECORD {
JUMP_PROCESS(10, "跳过工序"),
JUMP_STEP(20, "跳过工步"),
JUMP_STEP_IN_STATE(25, "跳过状态点中的工步"),
JUMP_STATE(30, "跳过状态点"),
ABNORMAL_DEDUCTION(40, "扣减异常"),
REDO_STATION(50, "工位重做"),
@ -6068,4 +6069,32 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* MesWorkCellJumpRecord 跳过类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_JUMP_TYPE {
SERIAL_SN(10, "过程条码"),
PRODUCT_SN(20, "产品条码"),
PACK_SN(30, "包装条码"),
OTHER(40, "其他");
private int value;
private String description;
MES_WORK_CELL_JUMP_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -9494,6 +9494,51 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 报废类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCRAP_TYPE {
ISOLATED_SCRAP(10, "ISOLATED", "隔离报废"),
AUTO_SCRAP(20, "AUTO_SCRAP", "自动报废");
private int value;
private String code;
private String description;
SCRAP_TYPE(int value, String code, 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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

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

@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam(value = "生产线名称")
private String workCenterName;
@Transient
@ApiParam("工序名称")
private String processName;
public MesPackage() {
}

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

@ -3692,7 +3692,8 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
DdlPreparedPack.getStringRightLikerPack(mesPackage.getCtNo(), "ctNo", packBean);
DdlPreparedPack.getStringBiggerPack(mesPackage.getCreateDateTimeStart(), "createDatetime", packBean);
DdlPreparedPack.getStringSmallerPack(mesPackage.getCreateDateTimeEnd(), "createDatetime", packBean);
return packBean;

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

@ -8,14 +8,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
@ -269,6 +273,17 @@ public class WmsDocMovementMaster extends BaseBean {
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String fourthRemake;
/**
*
*/
@Column(name = "SCRAP_TYPE")
@ApiParam("报废类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
public Integer scrapType;
@Column(name = "IS_REMOVE_ORDER")
@ApiParam(value = "是否撤销单据")
private Integer isRemoveOrder = CommonEnumUtil.FALSE;

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

@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -214,6 +214,29 @@ public class WmsMoveMaster extends BaseBean {
public WmsMoveMaster() {
}
public WmsMoveMaster(String organizeCode, String partNo, String partNameRdd, String transTypeCode,
String transTypeName, String unit, String destZoneNo, Double transQty, Double handledQty, Double rejectQty,
Integer busiTypeCode, String createDatetime, String createUser, String modifyUser,
String modifyDatetime, String refSrc) {
this.organizeCode = organizeCode;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.transTypeCode = transTypeCode;
this.transTypeName = transTypeName;
this.unit = unit;
this.destZoneNo = destZoneNo;
this.transQty = transQty;
this.handledQty = handledQty;
this.rejectQty = rejectQty;
this.busiTypeCode = busiTypeCode;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.refSrc = refSrc;
}
public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,
Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark,
String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId,

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

@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
/**
@ -96,6 +96,9 @@ public class WmsPartExtend extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String lotControl;
/**
* 单位：天
*/
@Column(name = "RANGE_LOT")
@ApiParam(value = "批次容差")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)

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

@ -6,16 +6,11 @@ import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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 javax.persistence.*;
import java.util.List;
/**
@ -137,6 +132,11 @@ public class WmsTmsShippingExt extends BaseBean {
@ApiParam("调拨单录入字段")
private String defectiveAllocation;
//关联单号
@Column(name="ORDER_NO")
@ApiParam("关联单号")
private String orderNo;
// @Transient
// @ApiParam("打印模板列表")
// private String defectiveAllocation;

166
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java
Unescape Escape View File

@ -0,0 +1,166 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description : GCDC集装箱model
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2020-11-24 18:17
* @Modify:
**/
@Data
@Api("GCDC集装箱model")
public class WmsGcdcContainerModel extends BaseBean {
@ApiParam("移库单号号")
public String orderNo;
@ApiParam("库存移动单号")
public String moveNo;
@ApiParam("条码")
public String sn;
@ApiParam(value = "ERP单号")
private String erpSrcNo;
@ApiParam(value = "客户编号")
private String custNo;
@ApiParam(value = "单据状态")
public Integer orderStatus;
@ApiParam(value = "库存移动单状态")
public Integer itemStatus;
@ApiParam(value = "包装编号")
private String packageNo;
@ApiParam("集装箱号")
private String containerNo;
@ApiParam("产地")
private String productPlace;
@ApiParam("托盘重量")
private Double packageWeight;
@ApiParam(value = "客户名称")
public String custNameRdd;
@ApiParam(value = "业务类型")
public Integer busiType;
@ApiParam(value = "交易类型代码")
private String transTypeCode;
@ApiParam(value = "物料号")
public String partNo;
@ApiParam(value = "物料号")
public String partNameRdd;
@ApiParam(value = "客户地址")
private String custAddr;
@ApiParam(value = "客户联系人")
private String custOwner;
@ApiParam(value = "客户电话号码")
private String custTel;
@ApiParam(value = "是否集装箱号")
private Integer isContainer;
@ApiParam("移库单号集合")
private List<String> orderNoList;
@ApiParam("库存移动单号集合")
private List<String> moveNoList;
@ApiParam("库存移动单条码集合")
private List<WmsMoveSn> moveSnList;
@ApiParam("库存条码集合")
private List<WmsStockSn> stockSnList;
@ApiParam(value = "仓库代码")
private String whNo;
@ApiParam(value = "存储区编号")
private String zoneNo;
@ApiParam(value = "库位代码")
private String locateNo;
@ApiParam(value = "客户发往地名称")
private String flagName;
@ApiParam(value = "客户发往地代码")
private String flagNo;
@ApiParam(value = "是否绑定发运")
private Integer isBindingShip = WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
public WmsGcdcContainerModel() {
}
public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo,
Integer orderStatus, String createDatetime, String createUser) {
this.id = id;
this.orderNo = orderNo;
this.moveNo = moveNo;
this.erpSrcNo = erpSrcNo;
this.custNo = custNo;
this.orderStatus = orderStatus;
this.createDatetime = createDatetime;
this.createUser = createUser;
}
public WmsGcdcContainerModel(Long id, String orderNo, String moveNo, String erpSrcNo, String custNo,
Integer itemStatus, String createDatetime, String createUser, Integer busiType) {
this.id = id;
this.orderNo = orderNo;
this.moveNo = moveNo;
this.erpSrcNo = erpSrcNo;
this.custNo = custNo;
this.itemStatus = itemStatus;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.busiType = busiType;
}
public WmsGcdcContainerModel(Long id, String orderNo, String packageNo, Double packageWeight, String custNo, String partNo, String flagNo) {
this.id = id;
this.orderNo = orderNo;
this.packageNo = packageNo;
this.packageWeight = packageWeight;
this.custNo = custNo;
this.partNo = partNo;
this.flagNo = flagNo;
}
public WmsGcdcContainerModel(Long id, String organizeCode, Double packageWeight, String packageNo, String zoneNo,
String locateNo, String whNo, String partNo, String partNameRdd, String custNo, String flagNo) {
this.id = id;
this.organizeCode = organizeCode;
this.packageWeight = packageWeight;
this.packageNo = packageNo;
this.zoneNo = zoneNo;
this.locateNo = locateNo;
this.whNo = whNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.custNo = custNo;
this.flagNo = flagNo;
}
}
Write Preview
Loading…
Cancel
Save