From 400b380b554d47b444b911e096a6c3ff2cc2b393 Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Wed, 26 Jun 2019 20:58:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 31 +++++++++++++++ .../wms/modelbean/WmsMoveUnfinishedOrderModel.java | 46 ++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java 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 86e3fd6..871d13c 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 @@ -63,4 +63,8 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "CAR_NO") @ApiParam(value = "车牌号") private String carNo; + + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "业务类型编码") + private Integer busiTypeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index cf9215a..5b262dc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -150,6 +150,21 @@ public class WmsMoveSn extends BaseBean { @ApiParam("特殊批次") public String fixLotNo; + + + @Transient + @ApiParam("业务类型编码") + private String busiTypeCode; + + + @Transient + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Transient + @ApiParam("关联单号") + public String refSrc; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ @@ -165,4 +180,20 @@ public class WmsMoveSn extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode, String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.busiTypeCode = busiTypeCode; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } + public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java new file mode 100644 index 0000000..7c4f4f1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author Yerik Stone + * @description WmsMoveUnfinishedOrderModel + * @date 2019/6/26 + */ +@Data +@Api("未完成订单模型") +public class WmsMoveUnfinishedOrderModel extends BaseBean{ + + + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("未完成数量") + private Double destQty; + + @ApiParam("业务类型") + private Integer busiTypeCode; + + @ApiParam("交易类型") + private String transTypeCode; + + @ApiParam("关联单号") + private String refSrc; + + public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.busiTypeCode = busiTypeCode; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } +} From a7bfc692fe20681986c269182944228038a14145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 26 Jun 2019 21:02:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?EXCEL=E6=95=B0=E6=8D=AE=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index beffb73..23a5718 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -17,6 +17,6 @@ public class ExportDataModel { private String exportData; - private LinkedHashMap exportCol; + private String exportCol; } From 299c0c5beee62b206c9501e68e33801fc220f7be Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 26 Jun 2019 21:14:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?DataObject=20Key=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index c631967..b673a6a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -78,6 +78,11 @@ public class BfDataObject extends BaseBean { private List propertyList; @Transient + @ApiParam(value = "数据对象主键") + @AnnoOutputColumn(hidden = true) + private BfDataObjectProperty primaryKey; + + @Transient @ApiParam(value = "数据对象主键属性") @AnnoOutputColumn(hidden = true) private List primaryPropertyList; From 2ce560b39f94ede84268cb0cf482e917ee2f876d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Jun 2019 21:33:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9=E5=92=8C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 26 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 7 ++++++ 2 files changed, 33 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 da720a0..26be640 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 @@ -296,6 +296,7 @@ public class WmsEnumUtil { /** * 产品入库，发运状态 + * WMS_产品报工明细信息 ：单据状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { @@ -2673,4 +2674,29 @@ public class WmsEnumUtil { return description; } } + + /** + * 外部接口单据来源枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_STATUS { + ZMMES("ZMMES", "知明MES"), + TBMES("TBMES", "MES接口"); + + private String value; + private String description; + + SRC_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } \ No newline at end of file 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 b8178a7..7b4f672 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 @@ -116,4 +116,11 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="SRC") @ApiParam("单据来源") public String src; + + /** + * 是否锁定：1=锁定 2=未锁定 + */ + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock; } From baeb202ca5d26daaaadb0f39d759b97ae8af1c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 26 Jun 2019 22:04:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index dfe7f4c..da71990 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -11,4 +11,12 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; * @Modify: **/ public interface WmsConfigRepository extends BaseRepository { + + /** + * 按照工厂代码和配置代码查询配置信息 + * @param organizeCode 工厂代码 + * @param configCode 配置代码 + * @return 配置信息 + */ + WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode); }