From 66a66f229be25bd3157188e3fe3388f5ae1b10a2 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Wed, 19 Jun 2019 10:28:05 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java new file mode 100644 index 0000000..d06e7e4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType; + +/** + * Created by Administrator on 2019/6/18. + */ +public interface WmsProdCfgTypeRepository extends BaseRepository { +} From 79d1da32307fe1586b72b4d3cb4b7e080ce316b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 19 Jun 2019 11:35:44 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 56 +++++++++++++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 10 ++-- 2 files changed, 48 insertions(+), 18 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 f04b9e2..430bead 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 @@ -492,9 +492,9 @@ public class WmsEnumUtil { OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"), SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"), - NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"), - NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"), - LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库"); + NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), + NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), + LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"); private int value; @@ -851,7 +851,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废"); + NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废"); private int value; private String code; @@ -919,7 +919,7 @@ public class WmsEnumUtil { private int value; private String description; - CS_ORDER_TYPE(int value,String description) { + CS_ORDER_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -948,12 +948,12 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ORDER_STATUS { - CREATE(10,"CREATE", "创建"), - STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"), - IN_INVENTORY(30,"IN_INVENTORY", "盘点中"), - INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"), - THAWING(50,"THAWING", "已解冻"), - CLOSED(60, "CLOSED","已关闭"); + CREATE(10, "CREATE", "创建"), + STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"), + IN_INVENTORY(30, "IN_INVENTORY", "盘点中"), + INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"), + THAWING(50, "THAWING", "已解冻"), + CLOSED(60, "CLOSED", "已关闭"); private int value; private String code; @@ -2376,4 +2376,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 几步法 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP { + ONE_STEP(1, "一步法"), TWO_STEP(2, "两步法"); + + private int value; + private String description; + + STEP(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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index c889b78..382f824 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -3,8 +3,6 @@ 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; @@ -16,8 +14,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.List; -import java.util.Map; /** * @Description : 作业类型 @@ -61,7 +57,7 @@ public class WmsOpType extends BaseBean { @Column(name = "LAST_TRANS_TIME") @ApiParam(value = "末次处理时间") - public String lastTransTime; + private String lastTransTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -75,7 +71,7 @@ public class WmsOpType extends BaseBean { @Column(name = "SPLIT_RULE") @ApiParam(value = "拆分规则") - public String splitRule; + private String splitRule; @Column(name = "IS_MERGE") @ApiParam(value = "是否合并单据", example = "0") @@ -83,7 +79,7 @@ public class WmsOpType extends BaseBean { @Column(name = "MERGE_RULE") @ApiParam(value = "合并规则") - public String mergeRule; + private String mergeRule; @Column(name = "IS_AUTO_CLOSE") @ApiParam(value = "任务未完是否关闭", example = "0") From 67cd5e008bfcf39d4e6c6cfca7b83fce05b0c962 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Wed, 19 Jun 2019 14:57:13 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AFsql=E6=8B=BC=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++-- 1 file changed, 16 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 30d28bc..5058ca7 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 @@ -1824,7 +1824,22 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } - + /** + * 主数据信息 分页查询 + * + * @param wmsProdCfgType + * @return + */ + public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); + DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsDeleted(),"isDeleted",result); +// getStringBuilderPack(wmsProdCfgType, result); + return result; + } /** * 盘点范围 条件封装 @@ -1844,5 +1859,4 @@ public class WmsHqlPack { return result; } - } From 7d0cd674cf01d9da5682a0adede4990123a31ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 19 Jun 2019 16:54:35 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E9=9B=B6=E6=98=9F=E9=80=80=E6=96=99?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=AF=BC=E5=85=A5=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 65 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/SapDspo.java | 106 ++++++++++----------- .../cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java | 66 +++++++++++++ 3 files changed, 184 insertions(+), 53 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java 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 f04b9e2..b2a832b 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 @@ -2376,4 +2376,69 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 外部单据：关联单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IMPORT_ORDER_TYPE { + PO("PO", "要货计划"), + ASN("ASN", "ASN"), + SCATTERED_OUT("C00", "零星出库指令"), + SCATTERED_INT("C01", "零星入指令"), + NC_DISMANTLING_PICKING("C02", "NC拆解领料"), + NC_DISMANTLING_RETURN("C03", "NC拆解退料"), + NC_SCRAPPED("C04", "NC报废指令"), + NOT_JIS("NOTJIS", "非JIS指令"), + STOCK_DUMP("D00", "库存转储指令"), + NC_INSTOCK("D01", "NC入库指令"), + SMRR("B00", "SMRR退货"), + DMR("B01", "DMR退货"), + OUT_SOURCING("A00", "委外发料指令"), + OUT_REBACK("A01", "委外退料指令"), + OUT_RETURN_SOURCING("A02", "委外返工发料指令"), + OUT_RETURN_("A03", "委外返工退料指令"), + SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"), + CS("CS", "盘点指令"), + CS_ADUJUST("CS_ADUJUST", "盘点调差指令"); + private String value; + private String description; + + IMPORT_ORDER_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + public static IMPORT_ORDER_TYPE codeOf(String value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + return values()[i]; + } + } + return null; + } + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java index d213172..3e2c13f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java @@ -22,7 +22,7 @@ import java.util.UUID; **/ @Data @Api(value="要货计划",description = "要货计划") -public class SapDspo { +public class SapDspo extends SapBase{ @ApiParam(value = "SA编号（或PO号）",example = "1") @AnnoOutputColumn @@ -92,58 +92,58 @@ public class SapDspo { @AnnoOutputColumn private Double prnnum; - //公共字段 ++++++++++++++++++++++++++++++++++++++++++ - @ApiParam(value = "处理人",example = "-1") - @AnnoOutputColumn - private String actusr = "导入"; - - @ApiParam(value = "SID",example = "-1") - @AnnoOutputColumn - private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString(); - - /*@ApiParam(value = "接收数据日期",example = "-1") - @AnnoOutputColumn - private String recymd; - - @ApiParam(value = "接收数据时间",example = "-1") - @AnnoOutputColumn - private String rechms; - - @ApiParam(value = "同步标志",example = "-1") - @AnnoOutputColumn - private String synflg;*/ - - @ApiParam(value = "同步日期",example = "-1") - @AnnoOutputColumn - private String synymd; - - @ApiParam(value = "同步时间",example = "-1") - @AnnoOutputColumn - private String synhms; - - /*@ApiParam(value = "处理标志",example = "-1") - @AnnoOutputColumn - private String actflg;*/ - - @ApiParam(value = "处理日期",example = "-1") - @AnnoOutputColumn - private String actymd; - - @ApiParam(value = "处理时间",example = "-1") - @AnnoOutputColumn - private String acthms; - - @ApiParam(value = "状态标志",example = "-1") - @AnnoOutputColumn - private String staflg; - - @ApiParam(value = "顺序号",example = "-1") - @AnnoOutputColumn - private Integer seq; - - @ApiParam(value = "GUID",example = "-1") - @AnnoOutputColumn - private String guid; +// //公共字段 ++++++++++++++++++++++++++++++++++++++++++ +// @ApiParam(value = "处理人",example = "-1") +// @AnnoOutputColumn +// private String actusr = "导入"; +// +// @ApiParam(value = "SID",example = "-1") +// @AnnoOutputColumn +// private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString(); +// +// /*@ApiParam(value = "接收数据日期",example = "-1") +// @AnnoOutputColumn +// private String recymd; +// +// @ApiParam(value = "接收数据时间",example = "-1") +// @AnnoOutputColumn +// private String rechms; +// +// @ApiParam(value = "同步标志",example = "-1") +// @AnnoOutputColumn +// private String synflg;*/ +// +// @ApiParam(value = "同步日期",example = "-1") +// @AnnoOutputColumn +// private String synymd; +// +// @ApiParam(value = "同步时间",example = "-1") +// @AnnoOutputColumn +// private String synhms; +// +// /*@ApiParam(value = "处理标志",example = "-1") +// @AnnoOutputColumn +// private String actflg;*/ +// +// @ApiParam(value = "处理日期",example = "-1") +// @AnnoOutputColumn +// private String actymd; +// +// @ApiParam(value = "处理时间",example = "-1") +// @AnnoOutputColumn +// private String acthms; +// +// @ApiParam(value = "状态标志",example = "-1") +// @AnnoOutputColumn +// private String staflg; +// +// @ApiParam(value = "顺序号",example = "-1") +// @AnnoOutputColumn +// private Integer seq; +// +// @ApiParam(value = "GUID",example = "-1") +// @AnnoOutputColumn +// private String guid; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java new file mode 100644 index 0000000..d466dd1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMiscr.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-19 13:21 + * @Modify: + **/ +@Data +@Api(value="零星领料(退)料结果",description = "零星领料(退)料结果") +public class WmsMiscr extends SapBase{ + + @ApiParam(value = "编号",example = "1") + @AnnoOutputColumn + private String refid; + + @ApiParam(value = "行号",example = "1") + @AnnoOutputColumn + private Double zeile; + + @ApiParam(value = "工厂",example = "1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "发出库存地点（退回库存地点）",example = "1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "物料编码",example = "1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "数量",example = "1") + @AnnoOutputColumn + private Double erfmg; + + @ApiParam(value = "计量单位",example = "1") + @AnnoOutputColumn + private String erfme; + + @ApiParam(value = "业务类型",example = "1") + @AnnoOutputColumn + private String zaction; + + @ApiParam(value = "交易日期",example = "1") + @AnnoOutputColumn + private String zpost; + + @ApiParam(value = "交易时间",example = "1") + @AnnoOutputColumn + private String ztime; + + public Double getZeileVal() { + return zeile== null ? 0D : this.zeile.doubleValue(); + } + + public Double getErfmgVal() { + return erfmg== null ? 0D : this.erfmg.doubleValue(); + } +} From c08a569ac59bb5aee3271b954d6cd4f4ed6ca363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 19 Jun 2019 17:46:26 +0800 Subject: [PATCH 05/14] =?UTF-8?q?sql=E4=BC=98=E5=8C=96=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E5=AE=9E=E4=BD=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=9A=84=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 +- .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 33 ++++++++++++++++++++-- 3 files changed, 35 insertions(+), 4 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 f04b9e2..9df3d38 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 @@ -1724,7 +1724,8 @@ public class WmsEnumUtil { WAREHOUSE(10, "WAREHOUSE", "仓库对象"), ZONE(20, "ZONE", "存储区对象"), LOCATE(30, "LOCATE", "库位对象"), - MATERIAL(40, "MATERIAL", "物料对象"); + MATERIAL(40, "MATERIAL", "物料对象"), + TRANS_TYPE(50,"TRANS_TYPE","交易代码对象"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 41ce948..cb2c596 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -40,6 +40,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("存储区列表") private List zoneList; + @ApiParam("交易代码列表") + private List transTypeList; + @ApiParam( value = "新增操作", example = "0" 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 30d28bc..9617727 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 @@ -1503,9 +1503,10 @@ public class WmsHqlPack { Integer index = 1; for (Map item : mapList) { - packBean.addColumnQuery(columnName," or model." + - columnName + " = :m_" + columnName + (index++).toString(), + packBean.addColumnQuery(columnName + index.toString()," or model." + + columnName + " = :m_" + columnName + index.toString(), item.get(keyName).toString()); + index++; } } @@ -1516,8 +1517,34 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList,Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); + + Set>> entries = groupDataAuth.entrySet(); + //拼sql + entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); + + for (Map.Entry> map : entries) { + + String key = map.getKey(); + List valueList = map.getValue(); + List vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); + String data = String.join(",", vList); + + if (StringUtils.isNotBlank(data)) { + List mapList = JSONObject.parseArray(data, Map.class); + if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) { + + packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); + break; + } + } + } + + String hqlString = " and ( 1=1 " + packBean.getPackedHql() + ") "; + + packBean.setWhereAppend(hqlString); + DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); From 4fad1795b108eeed26fa8e8cd373bb2c56975886 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Wed, 19 Jun 2019 17:58:46 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E6=96=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 10 ++++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 3 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 271275b..a4b9feb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库位物料表 @@ -56,6 +57,10 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; + @Transient + @ApiParam("库位类型") + private Integer locateType; + public Double getMin() { return this.min == null ? 0 : this.min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 5f4e250..fd123b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 供应商零件关系 @@ -36,4 +37,13 @@ public class WmsVendorPart extends BaseBean { @ApiParam(value = "物料号") private String partNo; + + @Transient + @ApiParam("物料名称") + private String partName; + + + @Transient + @ApiParam("供应商名称") + private String vendorName; } 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 fdf44c1..0b75c12 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 @@ -438,6 +438,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 + //DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateType().toString(), "locateType", result); DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); From 40f0860647251ce327b44bc959728448f991d800 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Wed, 19 Jun 2019 17:59:15 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E6=96=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java new file mode 100644 index 0000000..82bc3ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnit; + +public interface WmsUnitRepository extends BaseRepository { +} From b3272dc3d7cccf9c8d9471962046d84ae80c99e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 19 Jun 2019 20:06:03 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 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 1309dec..a0aa666 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 @@ -1724,7 +1724,8 @@ public class WmsEnumUtil { WAREHOUSE(10, "WAREHOUSE", "仓库对象"), ZONE(20, "ZONE", "存储区对象"), LOCATE(30, "LOCATE", "库位对象"), - MATERIAL(40, "MATERIAL", "物料对象"); + MATERIAL(40, "MATERIAL", "物料对象"), + TRANS_TYPE(50,"TRANS_TYPE","交易代码对象"); private String code; private String description; From ea83820fbf67623b65e5a23e07758d7bf7aa456d Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Wed, 19 Jun 2019 20:39:25 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=B7=9F=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ .../pojo/wms/repository/WmsUnitRepository.java | 12 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java 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 f04b9e2..ae308cf 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 @@ -2376,4 +2376,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 物料类型（用于物料） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_PART_TYPE { + RAW_MATERIAL(1,"原材料"), PARTIALLY_PREPARED_PRODUCTS(2,"半成品"), FINISHED_PRODUCT(3,"成品"); + + private int value; + private String description; + + WMS_PART_TYPE(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; + } + + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java new file mode 100644 index 0000000..7b1dfd3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnit; +import org.springframework.stereotype.Repository; + +/** + * Created by Administrator on 2019/6/19. + */ +@Repository +public interface WmsUnitRepository extends BaseRepository { +} 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 5058ca7..a50190e 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 @@ -1836,7 +1836,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsDeleted(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); // getStringBuilderPack(wmsProdCfgType, result); return result; } From 30dd11cce71ce0d9b7e771c617a50b7feeb32e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 19 Jun 2019 20:47:05 +0800 Subject: [PATCH 10/14] =?UTF-8?q?sql=E6=8B=BC=E6=8E=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 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 2567491..5ccb8eb 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 @@ -1459,31 +1459,28 @@ public class WmsHqlPack { String data = String.join(",", vList); if (StringUtils.isNotBlank(data)) { - List mapList = JSONObject.parseArray(data, Map.class); - if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) { - packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { - packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { - packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); - } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { - packMutilConditionHql(mapList, "PART_NO", "partNo", result); } } } - String hqlString = " and ( 1=1 " + result.getPackedHql() + ") "; + //转换封装后的hql + String packedHql = result.getPackedHql(); + if(packedHql.startsWith(" or")){ + packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; + System.out.println(packedHql); + } + + result.setWhereAppend(packedHql); - result.setWhereAppend(hqlString); // 通用数据拼接 WmsDataAuth wmsDataAuth = new WmsDataAuth(); wmsDataAuth.setOrganizeCode(organizeCode); @@ -1498,14 +1495,15 @@ public class WmsHqlPack { * @param columnName * @param packBean */ - private static void packMutilConditionHql(List mapList, String keyName, - String columnName, DdlPackBean packBean) { - Integer index = 1; - + private static void packMutilConditionHql(List mapList, String keyName,String columnName, DdlPackBean packBean) { + int index = 1; + String columnParam = null; for (Map item : mapList) { - packBean.addColumnQuery(columnName + index.toString()," or model." + - columnName + " = :m_" + columnName + index.toString(), + columnParam = columnName + String.valueOf(index); + packBean.addColumnQuery(columnParam, + " or model." + columnName + " = :m_" + columnParam, item.get(keyName).toString()); + index++; } } @@ -1541,9 +1539,14 @@ public class WmsHqlPack { } } - String hqlString = " and ( 1=1 " + packBean.getPackedHql() + ") "; + //转换封装后的hql + String packedHql = packBean.getPackedHql(); + if(packedHql.startsWith(" or")){ + packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; + System.out.println(packedHql); + } - packBean.setWhereAppend(hqlString); + packBean.setWhereAppend(packedHql); DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); From f834e91353095cea260fa5ccacfc3531d430ee88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 20 Jun 2019 09:20:54 +0800 Subject: [PATCH 11/14] =?UTF-8?q?Task#764+=E6=9E=9A=E4=B8=BETRUE=5FOR=5FFA?= =?UTF-8?q?LSE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 +++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 13 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 81 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsProductVersion.java | 51 ++++++++++++++ 4 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java 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 a0aa666..321a9bb 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 @@ -2475,4 +2475,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 任务数据来源：检查子数据 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRUE_OR_FALSE { + TRUE(1, "是"), FALSE(2, "否"); + + private int value; + private String description; + + TRUE_OR_FALSE(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; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 97740a8..0962326 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : @@ -24,11 +23,11 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_BOM") +@Table(name = "WMS_BOM") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="物料清单",description = "物料清单") +@Api(value = "物料清单", description = "物料清单") public class WmsBom extends BaseBean { @Column(name = "PART_NO") @@ -63,19 +62,23 @@ public class WmsBom extends BaseBean { @ApiParam(value = "子用量") private Double itemQty; + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + private String bomNum; + @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="有效起始日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_START_TIME") private String effStartTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="有效截止日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) @Column(name = "EFF_END_TIME") private String effEndTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java new file mode 100644 index 0000000..6197600 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -0,0 +1,81 @@ +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 全量BOM + * @Reference + * @Author dragon + * @CreateDate 2019/6/19 21:23 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_BOM_TOTAL") +@Api("全量BOM") +public class WmsBomTotal extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("父物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父物料描述") + private String partName; + + @Column(name = "UNIT") + @ApiParam("计量单位") + private String UNIT; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam(value = "子物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam(value = "子料物料描述") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子计量单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ApiParam(value = "子用量") + private Double itemQty; + + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam(value = "有效起始日期") + private String effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam(value = "有效截止日期") + private String effEndTime; + + @Column(name = "SID") + @ApiParam(value = "SID") + private String sid; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java new file mode 100644 index 0000000..1b034fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java @@ -0,0 +1,51 @@ +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 生产版本 + * @Reference + * @Author dragon + * @CreateDate 2019/6/19 21:23 + * @Modify + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PRODUCT_VERSION") +@Api("生产版本") +public class WmsProductVersion extends BaseBean { + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PV_CODE") + @ApiParam("生产版本") + private String pvCode; + + @Column(name = "PV_NAME") + @ApiParam("生产版本描述") + private String pvName; + + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + private String bomNum; + +} From 939d67e7f3dbf4f2db847989ab84dc86cefffea3 Mon Sep 17 00:00:00 2001 From: "sky.meng" Date: Thu, 20 Jun 2019 11:16:02 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86(=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsWorkCenterRepository.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java new file mode 100644 index 0000000..b662fb2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWorkCenterRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter; + +/** + * @Description : 产线信息管理(工作中心) + * @Reference : + * @Author : sky.meng + * @CreateDate : 2019-06-19 16:20 + * @Modify: + **/ +public interface WmsWorkCenterRepository extends BaseRepository { + +} From 16400aa31c1b99e4006a74480a7752c4c099f110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 20 Jun 2019 11:27:23 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=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/WmsUnit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 43fbac8..d82fa02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") - private String vendorNo; + private String unitCode; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") From f7d4f85d458240ee8eb15b701272ba61f34afab4 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Thu, 20 Jun 2019 13:08:13 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 2 +- .../estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 43fbac8..b960f52 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean { @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") - private String vendorNo; + private String UnitNo; @Column(name = "UNIT_NAME") @ApiParam(value = "单位名称") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java new file mode 100644 index 0000000..0e71027 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsUnitConvertReposity.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsUnitConvertReposity extends BaseRepository { +}