From 816557085f1376e203373cdc9a1908b63f1f4400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 23 Sep 2020 15:06:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix(base):=E4=BF=AE=E6=94=B9=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E5=8F=96=E5=80=BC=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 2b2895b..ffa8853 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -114,7 +114,7 @@ public class Pager { } public int getCurrentPage() { - return currentPage; + return currentPage < 1 ? 1 : currentPage; } public void setCurrentPage(int currentPage) { From 11750e9bf1184c01a7b75b5564cff06834d63d92 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Wed, 23 Sep 2020 17:34:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E7=9A=84pojo=EF=BC=8C=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=8A=9F=E8=83=BD=E5=8F=AF=E4=BB=A5=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/snapshot/SnapshotBean.java | 153 +++++++++++++++++++++ .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 34 ++++- .../wms/bean/snapshot/WmsMoveMasterSnapshot.java | 4 +- .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 8 +- .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 3 +- .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 3 +- 6 files changed, 185 insertions(+), 20 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java new file mode 100644 index 0000000..8a1e6b4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/SnapshotBean.java @@ -0,0 +1,153 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +@Data +@MappedSuperclass +public class SnapshotBean implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + @GenericGenerator(name = "generator", strategy = "increment") + @GeneratedValue(generator = "generator") + @Column(name = "snap_id") + private Long snapId; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="ORGANIZE_CODE", nullable = false) + @ApiParam(value ="组织代码") +// @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2) + public String organizeCode; + + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "有效性",example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + public Integer isValid; //CommonEnumUtil.IS_VAILD; + + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) + @ApiParam(value = "是否已删除",example = "2") + @AnnoOutputColumn(hidden = true) + //逻辑删除，软删除 + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA + + @Column(name="CREATE_USER",updatable = false) + @ApiParam(value = "创建用户") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String createUser; + + @Column(name="CREATE_DATE_TIME",updatable = false) + @ApiParam(value = "创建日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String createDatetime; + + @Column(name="MODIFY_USER") + @ApiParam(value = "修改人") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + dataSrc = "/impp/operate/sys-user/query-user-by-pager", + searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") + public String modifyUser; + + @Column(name="MODIFY_DATE_TIME") + @ApiParam(value = "修改日期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + public String modifyDatetime; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String createDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String createDateTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + public String modifyDateTimeEnd; + + @Transient + @ApiParam(value = "排序属性") + @AnnoOutputColumn(hidden = true) + public String orderByParam = ""; + + @Transient + @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") + @AnnoOutputColumn(hidden = true) + //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc + public transient Integer ascOrDesc = 1; + + public int getIsValidVal() { + return this.isValid == null ? 0 : this.isValid.intValue(); + } + + public int getIsDeletedVal() { + return this.isDeleted == null ? 0 : this.isDeleted.intValue(); + } + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } + } + return result; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java index 29477e4..f830b47 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -32,7 +33,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单明细信息") -public class WmsMoveDetailsSnapshot extends BaseBean { +public class WmsMoveDetailsSnapshot extends SnapshotBean { private static final long serialVersionUID = -4095410692227226944L; @@ -141,6 +142,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @Transient private Long finishedCounts; + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer consignation = 2; + + @Column(name = "GROUP_NO") + @ApiParam("分组号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String groupNo; + + @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "已处理数量", example = "0") + @ColumnDefault("0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + public Double handledQty; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam(value = "jis料架号") + private String queueGroupNo; + @Transient @ApiParam("交易类型") private String transTypeCode; @@ -182,10 +208,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean { @ApiParam("创建时间") private String createDateTime; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java index 7679f39..bf4419e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -31,7 +30,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单主表信息") -public class WmsMoveMasterSnapshot extends BaseBean { +public class WmsMoveMasterSnapshot extends SnapshotBean { private static final long serialVersionUID = 3569874772643448726L; @@ -150,7 +149,6 @@ public class WmsMoveMasterSnapshot extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") public transient Integer lockVersion; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java index 453d372..79bb4c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -33,7 +32,7 @@ import javax.persistence.*; @Index(columnList = "SNAPSHOT_TIME") }) @Api("库存移动单条码信息") -public class WmsMoveSnSnapshot extends BaseBean { +public class WmsMoveSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 2588101374261238353L; @@ -189,11 +188,6 @@ public class WmsMoveSnSnapshot extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; - public WmsMoveSnSnapshot() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java index 724a81d..c927e7d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,7 +32,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存信息", description = "库存信息") -public class WmsStockQuanSnapshot extends BaseBean { +public class WmsStockQuanSnapshot extends SnapshotBean { private static final long serialVersionUID = 8335719859185712904L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java index 8d15ecc..62a730f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean.snapshot; 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; @@ -45,7 +44,7 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "库存条码信息", description = "库存条码信息") -public class WmsStockSnSnapshot extends BaseBean { +public class WmsStockSnSnapshot extends SnapshotBean { private static final long serialVersionUID = 8641922373097608315L; From ba6470baad6c7e3b901001e0d03b471f6f38eba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 23 Sep 2020 17:41:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=98=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=98=E5=8C=85=E8=A7=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index eb0072f..9e6b793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -128,6 +128,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; + @Column(name = "QTY2") + @ApiParam(value = "二级包装数量") + private Double qty2; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; From 4bfb903e5417ea37c510d25c8004e7d439edefb1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 23 Sep 2020 19:07:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E9=82=A3=E5=8F=91=E8=BF=90=E6=8F=90=E4=BA=A4=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D&=E7=9B=98=E7=82=B9=E6=8F=90=E4=BA=A4sql?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index 4ce5d3c..a805f86 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -39,4 +39,7 @@ public class WmsStockFifoModel { @ApiParam("默认规则") private String defaultRule; + + @ApiParam("同批次") + private boolean fifoSameBatch; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8f75c78..3e5609b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1375,7 +1375,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "qty", result); + DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result); } if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { wmsStockSn.setQualityDateTimeStart(""); From 979e18c4a7bd6ab82d0f8fff24e01cb354c10b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 24 Sep 2020 09:08:11 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 9e6b793..b7bcc1c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -129,7 +129,7 @@ public class MesPart extends BaseBean implements Serializable { private Integer isSmallSize = 1; @Column(name = "QTY2") - @ApiParam(value = "二级包装数量") + @ApiParam(value = "包装数量") private Double qty2; @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 469a7e1..8ded48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -44,6 +44,9 @@ public class TJMgnBoardModel extends BaseBean { @ApiParam("不良处理类型") private String defectType; + @ApiParam("反喷标识") + private String reverseSprayMark; + @ApiParam("列名") private List> headModelList; From 9fb8962e4e991e710e91af826aef7e082cf101bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 24 Sep 2020 09:15:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AE=A2=E9=80=80=E4=BB=B6bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 926b291..5ecb56c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -178,4 +178,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "qty") public Integer qty; + @Transient + @ApiParam("工单类型") + private String woTypeName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java index 4cee1fd..64e9e70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModel.java @@ -36,6 +36,9 @@ public class QueueJitActualModel { public String workTypeName; @ApiParam("客户产线代码") + private String custPlantCode; + + @ApiParam("客户产线代码") private String custProdLineCode; @ApiParam("产品位置代码") @@ -73,13 +76,13 @@ public class QueueJitActualModel { } - public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custProdLineCode, String produceCtgyCode, + public QueueJitActualModel(Long id, String vinCode, String jisActualNo, Integer workType, String custPlantCode, String produceCtgyCode, String productSn, Integer detailStatus, String createUser, String createDatetime) { this.id = id; this.vinCode = vinCode; this.jisActualNo = jisActualNo; this.workType = workType; - this.custProdLineCode = custProdLineCode; + this.custPlantCode = custPlantCode; this.produceCtgyCode = produceCtgyCode; this.productSn = productSn; this.detailStatus = detailStatus; @@ -94,6 +97,7 @@ public class QueueJitActualModel { this.jisActualNo = jisActualNo; this.partNo = partNo; this.partName = partName; + this.produceCtgyCode = produceCtgyCode; this.qty = qty; this.createUser = createUser; this.createDatetime = createDatetime; From 2d2ff0ddb171597bc3667d3928afad685674f237 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 24 Sep 2020 09:40:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=902801=20=E6=AD=A6=E6=B1=89PRD-AMP-W?= =?UTF-8?q?MS2SAP=E5=9B=9E=E4=BC=A0TWD=E8=AE=A2=E5=8D=95=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=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/wms/bean/WmsMoveToERP.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 1e55325..733c9d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -236,6 +236,10 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "IS_SYNC2") + @ApiParam("同步标识2") + public Integer isSync2 = CommonEnumUtil.FALSE; + @Transient private Long shippingId;