From 7fcdae795cd2d36766e4fcb53cf303cfa14a7fc0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 15:57:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 10c0680..aa83a19 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -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, From 4e0cab2f6aaeaf3479fa94e9dd657ec831fedf17 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:27:43 +0800 Subject: [PATCH 2/8] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsGcdcContainerModel.java | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java new file mode 100644 index 0000000..5a4bd32 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -0,0 +1,169 @@ +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 orderNoList; + + @ApiParam("库存移动单号集合") + private List moveNoList; + + @ApiParam("库存移动单条码集合") + private List moveSnList; + + @ApiParam("库存条码集合") + private List stockSnList; + + @ApiParam(value = "打印队列物料库存集合") + private List wmsPartStockModels; + + @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; + } +} From 87dcbd64f82d4d527d57509258103abf861bb7a9 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Dec 2020 19:28:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?Fix=20bug#13411=20ASN=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java index 5a4bd32..3b23ea7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsGcdcContainerModel.java @@ -93,9 +93,6 @@ public class WmsGcdcContainerModel extends BaseBean { @ApiParam("库存条码集合") private List stockSnList; - @ApiParam(value = "打印队列物料库存集合") - private List wmsPartStockModels; - @ApiParam(value = "仓库代码") private String whNo; From 2ccee2523aab5dc22dda150ee83c1cb5718a063c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Dec 2020 14:40:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 28 ++++++++++++ .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ++++++++++++++++++++++ .../MesWorkCellJumpRecordRepository.java | 16 +++++++ 3 files changed, 96 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b2c21d4..0c83988 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java new file mode 100644 index 0000000..de9d7e6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java @@ -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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java new file mode 100644 index 0000000..6a3f7a7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java @@ -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 { +} From f21076733205388e0a8ed8784ca05818936eb281 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 24 Dec 2020 15:20:05 +0800 Subject: [PATCH 5/8] =?UTF-8?q?BUG=20#13415=2019058-=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E7=94=9F=E6=88=90=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=9C=80=E8=A6=81=E6=8A=8A=E5=8E=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=8F=B7=E4=BD=9C=E4=B8=BA=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=9C=A8=E7=95=8C=E9=9D=A2=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index e0654fb..0f4a349 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -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; From 7e400a1a6878d0a95b1576b4ddf6ff1ab296d43d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 24 Dec 2020 19:24:21 +0800 Subject: [PATCH 6/8] Fix bug#13399 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 21 ++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsPartExtend.java | 7 +++- 3 files changed, 68 insertions(+), 5 deletions(-) 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 90446fd..d487780 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 @@ -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); + } + } } 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 077a83c..295096f 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 @@ -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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index ca32ae5..c16b143 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -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) From 04f1da7f3f5a04087f13f255e8687c1072e9a3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Dec 2020 10:37:05 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=903057=20=E5=8C=85=E8=A3=85=E5=B1=A5?= =?UTF-8?q?=E5=8E=86=E6=8A=A5=E8=A1=A8=20-=20=E5=90=8E=E7=AB=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 158ed97..ff0bbdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -203,6 +203,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam(value = "生产线名称") private String workCenterName; + @Transient + @ApiParam("工序名称") + private String processName; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 1c1a2b0..0dacf19 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -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; From b20fc8e55236145a682b5a2cb2dfecd86b493b14 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 25 Dec 2020 11:48:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=80=BB=E8=A3=85=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 1 + .../pojo/mes/bean/MesWorkCellJumpRecord.java | 52 ---------------------- .../MesWorkCellJumpRecordRepository.java | 16 ------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 0c83988..c03278f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -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, "工位重做"), diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java deleted file mode 100644 index de9d7e6..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellJumpRecord.java +++ /dev/null @@ -1,52 +0,0 @@ -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; - -} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java deleted file mode 100644 index 6a3f7a7..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellJumpRecordRepository.java +++ /dev/null @@ -1,16 +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.MesWorkCellJumpRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellJumpRecordRepository extends BaseRepository { -}