yun-zuoyi
陈思洁 4 years ago
commit fefa52c9d2

@ -89,8 +89,9 @@ public class AndonEnumUtil {
QUALITY_ALARM_CALL("QUALITY_ALARM_CALL", "质量呼叫弹框界面"),
PART_ALARM_CALL("PART_ALARM_CALL", "物料呼叫弹框界面"),
ROUTING_ALARM_CALL("ROUTING_ALARM_CALL", "工艺呼叫弹框界面"),
OTHER_ALARM_CALL("OTHER_ALARM_CALL", "自处理呼叫弹框界面"),
OTHER_ALARM_CALL("OTHER_ALARM_CALL", "工装呼叫弹框界面"),
FIX_ERROR_CALL("FIX_ERROR_CALL", "自动报警呼叫弹框界面"),
MODULE_ALARM_CALL("MODULE_ALARM_CALL", "模具呼叫弹框界面"),
ALARM_SIGN("ALARM_SIGN", "响应弹框界面"),
ALARM_CANCEL("ALARM_CANCEL", "撤销二次提醒框"),
ALARM_RESOLVE("ALARM_RESOLVE", "解决弹框界面");
@ -1218,7 +1219,8 @@ public class AndonEnumUtil {
PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"),
MOULD("MOULD_ALARM", 160060111, "模具", "#0A8BEE");
private String value;
private Integer code;

@ -6068,4 +6068,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;
}
}
}

@ -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);
}
}
}

@ -0,0 +1,52 @@
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.*;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2020-12-24
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_WORK_CELL_JUMP_RECORD")
@Api("mes工位操作跳过记录表")
public class MesWorkCellJumpRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1017369816822438021L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "JUMP_TYPE")
@ApiParam("跳过类型 10=过程条码")
private Integer jumpType;
@Column(name = "JUMP_VALUE")
@ApiParam("跳过值")
private String jumpValue;
@Column(name = "JUMP_DESC")
@ApiParam("跳过描述")
private String jumpDesc;
}

@ -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.MesWorkCellJumpRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesWorkCellJumpRecordRepository extends BaseRepository<MesWorkCellJumpRecord, Long> {
}

@ -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;

@ -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,

@ -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)

@ -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;

@ -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 : GCDCmodel
* @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;
}
}
Loading…
Cancel
Save