From f3e53ff1eb5575826a5fc188129c4fc5f8f28faa Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 22 Apr 2020 19:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908150=2020011--=20=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=91=20=E3=80=908151=2020011--=20=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=89=93=E6=8C=89=E9=92=AE=EF=BC=8C=E8=A1=A5?= =?UTF-8?q?=E6=89=93=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E4=B8=89=E4=B8=AA=E6=8C=89=E9=92=AE=E7=89=9B=E5=9D=87?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=89=93=E5=87=BA=E5=AE=A2=E6=88=B7=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=E3=80=82=E5=85=B3=E8=81=94bug7501---0429?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsMoveDetailsBySnModel.java | 28 +++++++ .../i3plus/pojo/model/wms/WmsPoSnPrintModel.java | 4 + .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 97 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 8 ++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 9 ++ .../pojo/wms/repository/QadBopRepository.java | 2 + .../pojo/wms/repository/SodDetRepository.java | 17 ++++ 9 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java new file mode 100644 index 0000000..4d0778d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 19:46 + * @Modify: + **/ +@Data +public class WmsMoveDetailsBySnModel implements Serializable { + + private static final long serialVersionUID = -3023644672955363786L; + + @ApiParam("明细数据") + private List detailsList; + + @ApiParam("分页") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java index c198e17..44c8c9a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable { @ApiParam("打印条码") private List wmsStockSnList; + + @ApiParam("单据条码") + private List wmsPoSnList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index dba988a..59f3f84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -18,7 +18,7 @@ import javax.persistence.*; import java.io.Serializable; /** - * @Description : 包材BOM信息 + * @Description : QAD_BOP信息 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2020-01-09 14:40 @@ -29,7 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") -@Api("包材BOM信息") +@Api("QAD_BOP信息") public class QadBop implements Serializable { private static final long serialVersionUID = 4673217061075875734L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java new file mode 100644 index 0000000..e33e3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -0,0 +1,97 @@ +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.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.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 16:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="SOD_DET") +@Api("SOD_DET信息") +public class SodDet implements Serializable { + + private static final long serialVersionUID = 539607553249262854L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + 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="COLUMN_GROUP") + @ApiParam("分组列名") + public String columnGroup; + + @Column(name="COLUMN_GROUP_VALUE") + @ApiParam("分组列名值") + public String columnGroupValue; + + @Column(name="PROPERTIES_NAME") + @ApiParam("参数名") + public String propertiesName; + + @Column(name="PROPERTIES_VALUE") + @ApiParam("参数值") + public String propertiesValue; + + @Column(name="table_name") + @ApiParam("表名") + public String tableName; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0b173cb..57ebad4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -245,6 +245,14 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") private Integer executeStatus; + @Transient + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Transient + @ApiParam("执行") + private Integer isMakeUp; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } 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 9e8d916..9bba40c 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 @@ -127,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; - @Transient @ApiParam("打印模板") private String templateNo; @@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("剩余箱数量") private Long countBox; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 917f0a0..c9fdc27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Long boxQtys; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java index f6c8ef8..c271680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop; * @CreateDate : 2020-01-09 15:06 * @Modify: **/ +@Repository public interface QadBopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java new file mode 100644 index 0000000..f5cf661 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.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.QadBop; +import cn.estsh.i3plus.pojo.wms.bean.SodDet; +import org.springframework.stereotype.Repository; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +@Repository +public interface SodDetRepository extends BaseRepository { +}