From c7aca0a94d3e57ec6f0ec3b2433a0b29fab3b892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 28 Jun 2019 11:29:48 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E8=BD=AC=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF+=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 871d13c..e88ab0d 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 @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 库存移动单主表信息 @@ -52,6 +49,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "交易类型代码") private String transTypeCode; + @Lob @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage; From da12d8f6b099d1111cf546e900fb683204cca3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 13:11:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index a81ce3d..8641e46 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -110,6 +110,10 @@ public class SapDocFgSum extends BaseBean { @Column(name = "EFF_START_TIME") private String effStartTime; + @Transient + @ApiParam(value = "备注") + private String errorMsg; + @JsonSerialize(using = ToStringSerializer.class) @Transient public Long wdfdId; 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..a052d53 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 @@ -1137,6 +1137,17 @@ public class WmsHqlPack { return result; } + public static DdlPackBean packHqlcheckSNInLocate(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + + result.setWhereAppend(result.getWhereAppend()+" and qty > 0 "); + getStringBuilderPack(wmsStockQuan, result); + + return result; + } + /** * 质检单明细信息 查询条件封装 * From 3090b2aaad7fd556b61cb5b26478efc5588b9124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 13:56:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index f977ae9..54d19f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -78,6 +78,10 @@ public class WmsShipping extends BaseBean { @ApiParam("特殊发货标志") public String shippingFlag; + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + public String shippingTime; + @Transient @ApiParam(value ="客户简称") private String custName; @@ -89,4 +93,20 @@ public class WmsShipping extends BaseBean { @Column(name="AREA_NO") @ApiParam("ERP库存地") public String areaNo; + + @Column(name="CAR_NO") + @ApiParam("车号") + public String carNo; + + @Column(name="ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name="IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + public Integer isLock; + + @Column(name="ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + public Integer erpSyncFlag; } From 1b569ff3a8afc174bb6da3f2374c32e93072ce38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 14:56:20 +0800 Subject: [PATCH 04/11] =?UTF-8?q?ERP=E5=90=8C=E6=AD=A5=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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..f4a090c 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 @@ -2760,4 +2760,38 @@ public class WmsEnumUtil { } return null; } + + /** + * ERP同步标识 10=待同步，20=同步成功，30=同步失败 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_ERP_SYNC_FLAG { + CREATE(10, "待同步"), SUCCESS(20, "同步成功"), FAIL(30, "同步失败"); + + private int value; + private String description; + + WMS_ERP_SYNC_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } \ No newline at end of file From 16301be9dccffe1077341005140c270dfeb7b99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 16:58:39 +0800 Subject: [PATCH 05/11] =?UTF-8?q?JOB=E5=BC=80=E5=8F=91=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 112 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 3 + .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 13 +++ .../pojo/wms/repository/AmpJisRecRepository.java | 16 +++ 4 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java new file mode 100644 index 0000000..55ddac9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -0,0 +1,112 @@ +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 : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-28 15:12 + * @Modify: + **/ +@Data +@Entity +@Table(name="AMP_JIS_REC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="AMP_JIS收货",description = "AMP_JIS收货") +public class AmpJisRec extends BaseBean{ + + @Column(name="ORDER_NO") + @ApiParam("JIS单号") + public String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer orderStatus; + + @Column(name="VENDOR_NO") + @ApiParam(value = "g供应商编码", example = "10") + public Integer vendorNo; + + @Column(name="REMARK") + @ApiParam("备注") + public String remark; + + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + @Column(name="SHIPPING_FLAG") + @ApiParam("特殊发货标志") + public String shippingFlag; + + @Column(name="ERROR_MESSAGE") + @ApiParam("错误信息") + public String errorMessage; + + @Column(name="AREA_NO") + @ApiParam("ERP库存地") + public String areaNo; + + @Column(name="CAR_NO") + @ApiParam("车号") + public String carNo; + + @Column(name="VIN") + @ApiParam("VIN号") + public String vin; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + public String shippingTime; + + @Column(name="SID") + @ApiParam("sid") + public String sid; + + @Column(name="IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + public Integer isLock; + + @Column(name="ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + public Integer erpSyncFlag; + +} 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 67473bd..5b44eb5 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 @@ -161,6 +161,9 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long finishedCounts; + @Transient + private Long shippingId; + public Double getRejectQty(){ return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 54d19f6..559b83e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -109,4 +109,17 @@ public class WmsShipping extends BaseBean { @Column(name="ERP_SYNC_FLAG") @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) public Integer erpSyncFlag; + + public WmsShipping(){} + + public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) { + this.id = id; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.custNo = custNo; + this.carNo = carNo; + this.areaNo = areaNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java new file mode 100644 index 0000000..daf24d9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.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.AmpJisRec; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface AmpJisRecRepository extends BaseRepository { +} 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 06/11] =?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 07/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=20wms=E6=8E=A8?= =?UTF-8?q?=E9=80=81AMP=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 { +} From 493fbb83d905b85e1c697a82e1c3d03dd2b9f3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 18:01:28 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a052d53..6d2694a 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 @@ -1115,7 +1115,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringLikerPack(wmsStockSn.getRefSrc(), "refSrc", result); // 物料编码支持多选 DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); From eefaf55f246a77f972a10bad3531d37d98884500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 19:05:17 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 55ddac9..3332735 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -62,8 +62,8 @@ public class AmpJisRec extends BaseBean{ public Integer orderStatus; @Column(name="VENDOR_NO") - @ApiParam(value = "g供应商编码", example = "10") - public Integer vendorNo; + @ApiParam(value = "供应商编码", example = "10") + public String vendorNo; @Column(name="REMARK") @ApiParam("备注") From 97adebba214e0e5ed33ae6875682447f84ce3ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 28 Jun 2019 20:11:27 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=20=20=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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 a47dcda..09b7200 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 @@ -2691,7 +2691,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), - TBMES("TBMES", "MES接口"); + TBMES("TBMES", "MES接口"), + AMP("AMP","AMP系统"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 3332735..7d342f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -109,4 +109,12 @@ public class AmpJisRec extends BaseBean{ @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) public Integer erpSyncFlag; + public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){ + this.id= id; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.vendorNo = vendorNo; + this.qty = qty; + this.unit = unit; + } } From c2609be241cb221ba1be342f8cec828d9fd7f1f5 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 28 Jun 2019 21:07:18 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=20=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a052d53..e6cb9e5 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 @@ -329,7 +329,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); @@ -1434,7 +1434,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrintRcd.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);