diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..11691be 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 9302dfc..0cf8b6d 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index a933723..8debbf6 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index fcc3573..cdb17df 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -716,7 +716,10 @@ public class MesEnumUtil { SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), WC_CHECK("WC_CHECK", "开线检查项"), - BOARD("BOARD", "看板类型"); + BOARD("BOARD", "看板类型"), + EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"), + EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"), + EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index b7d0c56..900dbb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - CANCEL(20, "已发运"); + SHIPPED(20, "已发运"); private int value; private String description; @@ -3338,7 +3338,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FSM_STATE_TYPE { BEGIN(10, "begin", "开始状态点"), - END(20, "end", "结束状态点"); + END(40, "end", "结束状态点"); private int value; private String code; 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 79ea203..06d2317 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 @@ -715,8 +715,8 @@ public class WmsEnumUtil { PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"), TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"), - EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"); - + EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), + LOADING_ORDER(530, "LOADING_ORDER", "装车单"); private int value; private String code; private String description; @@ -6610,5 +6610,4 @@ public class WmsEnumUtil { return valueOf(val); } } - } diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 712a842..0bfac69 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..b7991cc 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 375d0fd..e0d305b 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index d1ea30d..91f8894 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..3b9e57a 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a2bb2df..4f24980 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index 5e7684b..651f8dc 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 8664dd2..c7bebed 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index d08568e..0549d1f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -93,4 +93,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 0bc3879..48a7682 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -91,6 +91,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @Transient private List childQcList; + @Transient + @ApiParam("备注") + private String memo; + public MesQcCheckStandard() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index 4a8aec6..a4b29ec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -43,6 +43,13 @@ public class ButtonDynamicModel { this.buttonName = buttonName; } + + public ButtonDynamicModel(String buttonCode, String buttonName, String paramCode){ + this.buttonCode = buttonCode; + this.buttonName = buttonName; + this.paramCode = paramCode; + } + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ this.id = id; this.buttonCode = buttonCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 19d1a22..d1220a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -97,6 +97,9 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private String connectTypeName; + @ApiParam("作业校验模式") + private Integer checkModel; + public MesEquipmentModel() { @@ -139,7 +142,7 @@ public class MesEquipmentModel implements Serializable { } //获取设备分页数据 queryMesEquipmentByPager - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -163,6 +166,7 @@ public class MesEquipmentModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.checkModel = checkModel; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 9ea903c..1e4ee99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -96,6 +96,9 @@ public class MesPlcModel implements Serializable { @ApiParam("OPCUA路径") private String opcUrl; + @ApiParam("PLC类型") + private Integer plcType; + public MesPlcModel() { } @@ -103,7 +106,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -131,5 +134,6 @@ public class MesPlcModel implements Serializable { this.device = device; this.objectCode = objectCode; this.opcUrl = opcUrl; + this.plcType = plcType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java index b7a7eef..9fce24b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -29,7 +29,7 @@ public class MesWorkOrderModel { //客户产线代码 @ApiParam("ProductionLineID") @AnnoOutputColumn - private String custProdLineCode; + private String workCenterCode; //数量 @ApiParam("DemandQty") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 7bd7307..78826ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -132,9 +132,6 @@ public class StationRequestBean implements Serializable { @ApiParam("客户工厂代码") private String customerFactoryCode; - @ApiParam("发运命令") - private String shippingCmd; - @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 51701ae..e3808fb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2495,6 +2495,30 @@ public class MesHqlPack { return packBean; } + /** + * 散件产品组配置 + * + * @param mesProdScatterDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesScatterDetail(MesProdScatterDetail mesProdScatterDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdScatterDetail, organizeCode); + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getProduceCtgyCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getProduceCtgyCode(), "produceCtgyCode", packBean); + } + if (!StringUtils.isEmpty(mesProdScatterDetail.getSpCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesProdScatterDetail.getSpCfgCode(), "spCfgCode", packBean); + } + return packBean; + } + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 265f98d..b5c2cd3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 0080b0c..8767603 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 24de8cf..977c14a 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..dc4ea86 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 069a4e2..788be96 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 590b56c..3930e69 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index ac9e7dd..284329f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index ebf9603..b077ae5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -41,6 +41,10 @@ public class BasVendor extends BaseBean{ @ApiParam("供应商全称") private String vendorDesc; + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + @Column(name="VENDOR_ADDR") @ApiParam("供应商地址") private String vendorAddr; @@ -57,10 +61,6 @@ public class BasVendor extends BaseBean{ @ApiParam(value = "是否发ASN", example = "0") private Integer isAsn; - @Column(name = "USER_NAME") - @ApiParam(value = "用户名") - private String userName; - @Column(name = "PASSWORD") @ApiParam(value = "密码") private String password; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index f250b58..90d32ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -47,4 +47,14 @@ public class WmsCustWindow extends BaseBean { @Column(name = "DELAY_HOUR") @ApiParam(value = "容差") private Integer delayHour; + + public WmsCustWindow(WmsCustWindow custWindow) { + this.custNo = custWindow.getCustNo(); + this.custWindowTime = custWindow.getCustWindowTime(); + this.weeks = custWindow.getWeeks(); + this.delayHour = custWindow.getDelayHour(); + } + + public WmsCustWindow() { + } } 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 574361d..5398ffd 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -359,4 +358,10 @@ public class WmsDocMovementDetails extends BaseBean { this.modifyDatetime = modifyDatetime; } + + public WmsDocMovementDetails(WmsPOMasterDetails poMasterDetails) { + this.orderNo = poMasterDetails.getOrderNo(); + this.planDate = poMasterDetails.getPlanDate(); + this.planTime = poMasterDetails.getPlanTime(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 3fe234b..9b74c53 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -217,4 +217,12 @@ public class WmsDocMovementMaster extends BaseBean { public int getBusiTypeVal() { return this.busiType == null ? 0 : this.busiType; } + + public WmsDocMovementMaster(WmsPOMaster wmsPoMaster) { + this.orderNo = wmsPoMaster.getOrderNo(); + this.vendorNo = wmsPoMaster.getVendorNo(); + } + + public WmsDocMovementMaster() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 20e8f31..32ce767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 销售订单明细表 @@ -67,4 +68,8 @@ public class WmsDocSoDetails extends BaseBean { @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; + + @Transient + @ApiParam(value = "客户编号") + private String custCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java index b7e6d03..e2ff9c2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDockOrderInfo.java @@ -72,6 +72,10 @@ public class WmsDockOrderInfo extends BaseBean { private String orderNo; @Transient + @ApiParam("驾驶员编码") + private String driverNo; + + @Transient @ApiParam("库位代码") private Integer masterStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java new file mode 100644 index 0000000..45776dc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/AssignmentDto.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : 发运计划任务跟踪 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-27 4:37 下午 + * @Modify: + **/ +@Data +@Entity +public class AssignmentDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "单号") + private String orderNo; + + @ApiParam(value = "时间") + private String createDatetime; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "源存储区") + private String srcZoneNo; + + @ApiParam(value = "客户编码") + private String custNo; + + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @ApiParam(value = "状态中文描述", example = "1") + private String itemStatusStr; + + @ApiParam(value = "出库数量") + private Double outQty; + + public AssignmentDto(String orderNo, String createDatetime, String partNameRdd, + String srcZoneNo, String custNo, Integer itemStatus, Double outQty, String partNo) { + this.orderNo = orderNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.srcZoneNo = srcZoneNo; + this.custNo = custNo; + this.itemStatus = itemStatus; + this.outQty = outQty; + this.partNo = partNo; + } + + public AssignmentDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java index ffaf492..9f03900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -72,4 +72,7 @@ public class WmsStockSnDto { this.partSpec = partSpec; this.zoneNo = zoneNo; } + + public WmsStockSnDto() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java index 680c401..a1db922 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -21,6 +21,9 @@ public class WmsSupplierExtensionDto { @ApiParam(value = "供应商编号") private String vendorNo; + @ApiParam(value = "供应商编号") + private String vendorName; + @ApiParam(value = "数量") private Integer num; @@ -28,8 +31,9 @@ public class WmsSupplierExtensionDto { } - public WmsSupplierExtensionDto(String vendorNo, Integer num) { + public WmsSupplierExtensionDto(String vendorNo, Integer num, String vendorName) { this.vendorNo = vendorNo; this.num = num; + this.vendorName = 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 9be3c1c..792a479 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 @@ -1663,7 +1663,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index f153994..8bc1aa2 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 1bef72c..c4793b9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-PROD-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform