diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index dbf14e7..a427d3a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -589,7 +589,8 @@ public class SwebEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; 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 0011042..850874c 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 @@ -725,7 +725,8 @@ public class WmsEnumUtil { UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), - LOADING_ORDER(530, "LOADING_ORDER", "装车单"); + LOADING_ORDER(530, "LOADING_ORDER", "装车单"), + SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"); private int value; private String code; private String description; 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 184bdff..edb96e4 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 @@ -113,6 +113,16 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; + @Column(name = "BOM_TYPE") @ApiParam(value = "BOM类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 5398ffd..01e7b12 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -184,6 +184,22 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "销售单据号") private String soOrderNo; + @Column(name = "MEL_TYPE") + @ApiParam(value = "材料类型") + private String melType; + + @Column(name = "PROJECT_NO") + @ApiParam(value = "项目号") + private String projectNo; + + @Column(name = "PRODUCTION_GROUP") + @ApiParam(value = "生产小组") + private String productionGroup; + + @Column(name = "CUST_PART_NO") + @ApiParam(value = "客户零件号") + private String custPartNo; + @Transient @ApiParam(value = "替代物料编码") private String subPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 752e8bb..c7e33b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,11 +6,11 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"), - SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"), + SWEB2WMS(50, "SWEB2WMS-2", "SWEB --> WMS"); private int value; private String name;