From 31f6f4deeff53c80c571dcb0196797621b7e7070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 28 Jun 2019 17:03:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9EAMP=20ASN=E4=B8=BB=E8=A1=A8=E3=80=81=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=E6=98=8E=E7=BB=86=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B1=9E=E6=80=A7=20hql=E6=9F=A5=E8=AF=A2ASN=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 8 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 +++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 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 1037ff2..d515dd1 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 @@ -94,7 +94,8 @@ public class WmsEnumUtil { REG(10, "REG", "原物料采购"), SUB(20, "SUB", "委外采购"), TAR(30, "TAR", "多角贸易采购"), - TAP(40, "TAP", "多角代采购"); + TAP(40, "TAP", "多角代采购"), + AMP(50, "AMP", "AMP拉动"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index b1ff4f5..0f739c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -101,4 +101,12 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("供应商名称") private String vendorName; + + @Column(name = "ACTION_STATUS") + @ApiParam(value = "处理状态", example = "10") + public Integer actionStatus; + + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; } 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 ac6e53d..57b0c74 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 @@ -42,7 +42,7 @@ public class WmsDocFgDetail extends BaseBean { public String lineNo; @Column(name="COMMIT_TIME") - @ApiParam("提交日期") + @ApiParam("提交时间") public String commitTime; @Column(name="MFG_LOG_NO") @@ -127,4 +127,8 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="REMARK") @ApiParam("备注") public String remark; + + @Column(name="COMMIT_DATE") + @ApiParam("提交日期") + public String commitDate; } 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 0e91584..a7fe71c 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 @@ -2067,4 +2067,25 @@ public class WmsHqlPack { return result; } + + /** + * 根据id集合查询生产报工明细表的数据 + * + * @param statusList + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList,String organizeCode) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(statusList,"asnStatus",result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); + DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result); + DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + return result; + } } From b5ff789263c1754f07faed2b589f0073e2ca9bc8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 28 Jun 2019 17:17:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=80=E5=8F=91=20wms=E6=8E=A8=E9=80=81A?= =?UTF-8?q?MP=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpPart.java | 45 +++++++++++++++ .../i3plus/pojo/wms/bean/AmpStockCurrent.java | 67 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 32 +++++++---- .../wms/repository/AmpStockCurrentRepository.java | 16 ++++++ 4 files changed, 148 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java new file mode 100644 index 0000000..d6950be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.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.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : AMP_物料 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 11:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="AMP_PART") +@Api("AMP_物料") +public class AmpPart extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + /** + * 状态：B汇总库存到AMP系统 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private String orderStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java new file mode 100644 index 0000000..8a365e0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : AMP_实时库存表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="AMP_STOCK_CURRENT") +@Api("AMP_实时库存表") +public class AmpStockCurrent extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "ZONE_NAME") + @ApiParam(value = "存储区名称") + private String zoneName; + + /** + * 状态：10=创建，20=已处理，30=处理出错 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 15580ec..5427a91 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -30,17 +30,6 @@ import javax.persistence.Transient; @Api("盘点实盘信息") public class WmsCSFactTrans extends BaseBean { - public WmsCSFactTrans(){} - - public WmsCSFactTrans(Double factQty, String partNo){ - if(factQty == null) { - this.factQty = 0d; - }else{ - this.factQty = factQty; - } - this.partNo = partNo; - } - @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; @@ -98,7 +87,26 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "剩余数量", example = "1") public Double surplusQty; - @Transient + @Column @ApiParam("源库位编号") public String srcLocateNo; + + @Column + @ApiParam("源存储区编号") + public String srcZoneNo; + + @Column + @ApiParam("源仓库编号") + public String srcWhNo; + + public WmsCSFactTrans(){} + + public WmsCSFactTrans(Double factQty, String partNo){ + if(factQty == null) { + this.factQty = 0d; + }else{ + this.factQty = factQty; + } + this.partNo = partNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java new file mode 100644 index 0000000..8f5f316 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.AmpStockCurrent; +import org.springframework.stereotype.Repository; + +/** + * @Description : AMP_实时库存表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-28 15:19 + * @Modify: + **/ +@Repository +public interface AmpStockCurrentRepository extends BaseRepository { +}