From 7ac3509f96b05862b47defb832b46c34c509e2a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 26 Jun 2019 21:01:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?= 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, 3 insertions(+), 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 2223392..336fe7a 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 @@ -1129,7 +1129,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); - + if(wmsStockSn.getIsValid()!= null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); + } getStringBuilderPack(wmsStockSn, result); return result; From 6f41158ecb432a43ad270aba759291178799dfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 27 Jun 2019 20:15:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 2 files changed, 18 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 c777851..f977ae9 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 @@ -85,4 +85,8 @@ public class WmsShipping extends BaseBean { @Transient @ApiParam(value = "发往地简称") private String flagName; + + @Column(name="AREA_NO") + @ApiParam("ERP库存地") + public String areaNo; } 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 2223392..709c651 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 @@ -2051,4 +2051,18 @@ public class WmsHqlPack { return result; } + /** + * 根据id集合查询生产报工明细表的数据 + * + * @param ids + * @return + */ + public static DdlPackBean packHqlWmsDocFgDetail(List ids) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(ids,"id",result); + + return result; + } } From b98b48e4e5dc0ec6e8a5f99634a9454b74920f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 27 Jun 2019 20:56:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?SAP=5F=E4=BA=A7=E5=93=81=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=A1=A8=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/SapDocFgSum.java | 136 +++++++++++++++++++++ .../pojo/wms/repository/SapDocFgSumRepository.java | 17 +++ 2 files changed, 153 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java 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 new file mode 100644 index 0000000..a81ce3d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 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; +import javax.persistence.Transient; + +/** + * @Description :SAP_产品报工汇总表 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SAP_DOC_FG_SUM") +@Api("SAP_产品报工汇总表") +public class SapDocFgSum extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="PART_NO") + @ApiParam(value = "物料编码") + 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="ERP_WORK_CENTER") + @ApiParam("ERP_工作中心") + public String erpWorkCenter; + + @Column(name="IN_AREA_NO") + @ApiParam("入库ERP库存地") + public String inAreaNo; + + @Column(name="ITEM_PART_NO") + @ApiParam("子物料号") + public String itemPartNo; + + @Column(name="ITEM_PART_NAME") + @ApiParam("子料物料描述") + public String itemPartName; + + @Column(name="ITEM_UNIT") + @ApiParam("子计量单位") + public String itemUnit; + + @Column(name="ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子用量", example = "0") + public Double itemQty; + + @Column(name="OUT_AREA_NO") + @ApiParam("消耗ERP库存地") + public String outAreaNo; + + /** + * 状态:10=新建,20=已处理,30=处理出错 + */ + @Column(name="ORDER_STATUS") + @ApiParam(value = "状态", example = "1") + public Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 + */ + @Column(name="SRC") + @ApiParam("单据来源") + public String src; + + /** + * 是否锁定：1=锁定 2=未锁定 + */ + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; + + @JsonSerialize(using = ToStringSerializer.class) + @Transient + public Long wdfdId; + + public SapDocFgSum(){} + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java new file mode 100644 index 0000000..02ebe5d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.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.SapDocFgSum; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-27 20:19 + * @Modify: + **/ +@Repository +public interface SapDocFgSumRepository extends BaseRepository { + +} From 0962b810ce488f3b068b00c88f13421cc17c0869 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 21:42:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Json=20=E8=BD=AC=E6=8D=A2=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 102685a..9730fb8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1162,15 +1162,15 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL), - BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL); -// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME); + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); +// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); /** * 属性类型值 @@ -1202,7 +1202,12 @@ public class BlockFormEnumUtil { */ private SQL_WHERE defaultWhere; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + /** + * 默认查询关系 + */ + private String defaultValue; + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1210,6 +1215,7 @@ public class BlockFormEnumUtil { this.clzFullName = clzFullName; this.controlType = controlType; this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; } public int getValue() { From 72ef115db879afe9f676645931e85b6432aaa919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 27 Jun 2019 22:03:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=20=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 23eb182..20a2d07 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 @@ -64,25 +64,25 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "物料名称") private String partNameRdd; - @Column(name = "LOT_NO") + @Column(name = "LOT_NO", nullable = false) @ApiParam("收货日期（批次编码）") - public String lotNo; + public String lotNo = ""; - @Column(name = "DATE_CODE") + @Column(name = "DATE_CODE", nullable = false) @ApiParam(value = "生产日期") - public String dateCode; + public String dateCode = ""; - @Column(name = "LEFT_CODE") + @Column(name = "LEFT_CODE", nullable = false) @ApiParam(value = "有效期") - private String leftCode; + private String leftCode = ""; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "FIX_LOT_NO") + @Column(name = "FIX_LOT_NO", nullable = false) @ApiParam(value = "特殊批次") - private String fixLotNo; + private String fixLotNo = ""; @Column(name = "CUST_NO") @ApiParam(value = "客户编码")