diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 50c47c9..0e93187 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6933,4 +6933,52 @@ public class MesEnumUtil { return tmp; } } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY { + + FL("FL", "DOOR_FRONT_LEFT"), + FR("FR", "DOOR_FRONT_RIGHT"), + RL("RL", "DOOR_REAR_LEFT"), + RR("RR", "DOOR_REAR_RIGHT"); + + private String description; + private String value; + + PRODUCE_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 203174c..37ae66f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -856,7 +856,9 @@ public class WmsEnumUtil { INTERNAL_WORK_ORDER_MATERIAL_OUT_STOCK(650, "INTERNAL_SHIPPING", "内部工单物料出库"), CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), - PROD_SCRAP(680, "PROD_SCRAP", "生产报废"); + PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), + OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料"); + private int value; private String code; private String description; @@ -9023,4 +9025,50 @@ public class WmsEnumUtil { return null; } } + + + /** + * 成品条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_STATUS { + NORMAL(10, "正常"), + REPAIRE(20, "返工"), + SCRAP(30, "报废"); + + private int value; + private String description; + + PRODUCT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PRODUCT_STATUS codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 807a90b..e27e140 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -139,4 +139,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "QC_STATUS") @ApiParam("质量状态") private Integer qcStatus = 10; + + @Column(name = "JIS_BACKFLUSH_STATUS") + @ApiParam("回冲状态") + private String jisBackflushStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index 1a8afdd..fbe8994 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -93,7 +93,6 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index a3e4049..c16f45c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -185,7 +185,7 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -200,6 +200,7 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.queueSeq = queueSeq; this.groupSeq = groupSeq; + this.serialNumber = serialNumber; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index b060637..b091b3a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -19,17 +19,17 @@ public class Part implements Serializable { @XStreamAlias("item") private String item; + @XStreamAlias("componentGroup") + private String componentGroup; + @XStreamAlias("dock") private String dock; @XStreamAlias("qty") private String qty; - @XStreamAlias("componentGroup") - private String componentGroup; - @ApiParam("是否是baseModule") - private boolean isBaseModule; + private Integer isBaseModule; @ApiParam("前左数量") private String flQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java index 846bec2..fbf4020 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -37,7 +37,7 @@ public class Pn implements Serializable { private List parts; @XStreamAlias("optioncode") - private List codeRules = new ArrayList<>(); + private List codeRules; @ApiParam("新vin号") private String newVin; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 067f00b..c7e2797 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -631,9 +631,6 @@ public class MesPcnHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) { - DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean); - } if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 6447a3a..ac880ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -182,6 +184,20 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "jis编号") private String jisNo; + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位号") + private String terminalNo; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "离开时间") + private String processTime; + + @Column(name = "PRODUCT_STATUS") + @ApiParam(value = "成品条码状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") + private Integer productStatus; + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 07812e0..21658c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -244,6 +244,18 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注2") private String secondaryRemake; + @Column(name = "THIRD_REMAKE") + @ApiParam(value = "备注3") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_REMARK_PERSON", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String thirdRemake; + + @Column(name = "FOURTH_REMAKE") + @ApiParam(value = "备注4") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue") + private String fourthRemake; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d74ecbd..28a59c5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -172,6 +172,14 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("仓库") private String whNo; + @Transient + @ApiParam(value = "ERP单号") + private String erpSrcNo; + + @Transient + @ApiParam(value = "版本") + private String version; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { @@ -179,15 +187,82 @@ public class WmsDocMovementSn extends BaseBean { this.partNo = partNo; } - public WmsDocMovementSn(String orderNo,String custNo,String partNo,String partNameRdd,String lotNo, - String whNo,String createDatetime,Double sumQty) { + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,Double sumQty) { this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; this.custNo = custNo; + this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; this.partNameRdd = partNameRdd; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, + String whNo,String erpSrcNo,String version,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.custNo = custNo; + this.partNameRdd = partNameRdd; this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.version = version; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime, + String whNo,String erpSrcNo,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.whNo = whNo; + this.erpSrcNo = erpSrcNo; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String version,String whNo,String custNo, + String erpSrcNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.custNo = custNo; + this.erpSrcNo = erpSrcNo; + this.planDate = planDate; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String version,String vendorNo,Integer snStatus,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.snStatus = snStatus; this.sumQty = sumQty; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java new file mode 100644 index 0000000..90a60c4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartChange.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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 : puxiao.liao + * @CreateDate : 2020-08-19 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_PART_CHANGE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "零件装换信息", description = "零件装换信息") +public class WmsPartChange extends BaseBean { + private static final long serialVersionUID = -2857107665974689720L; + + @Column(name = "BEF_PART_NO") + @ApiParam(value = "转换前物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String befPartNo; + + @Column(name = "AFT_PART_NO") + @ApiParam(value = "转换后物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") + private String aftPartNo; + + + @Column(name = "REMARK") + @ApiParam(value = "备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String remark; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 5ebf953..0ffdd1d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -104,4 +104,14 @@ public class WmsListElement extends BaseBean { @Column(name = "EXPLICIT_COLUMN_NAME") @ApiParam(value = "回显列名") private String explicitColumnName; + + public WmsListElement() { + } + + public WmsListElement(Integer seq, String userCode, Long functionId, String organizeCode) { + this.seq = seq; + this.userCode = userCode; + this.functionId = functionId; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java new file mode 100644 index 0000000..fca0c32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartChangeRepository.java @@ -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.WmsPartChange; +import org.springframework.stereotype.Repository; + +/** + * @Description : 零件装换信息数据访问层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-08-19 + * @Modify: + **/ +@Repository +public interface WmsPartChangeRepository extends BaseRepository { +}