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 caa2b5d..3a774f8 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 @@ -12,6 +12,38 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + @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 valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * 包装规格-是否混包 MES_PACK_SPEC * 10. @@ -172,7 +204,9 @@ public class MesEnumUtil { this.description = description; } - public String getValue() { return value;} + public String getValue() { + return value; + } public String getDescription() { return 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 2669422..bef1e71 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 @@ -1180,7 +1180,7 @@ public class MesPcnEnumUtil { MATERIAL(30, "materials", "物料"), ROUTE(40, "routes", "工艺"), ONLINE_SIGNAL(50, "onlineSignal", "开线信号"), - MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号"); + ENVIRONMENT(60, "environment", "环境"); private int value; 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 91742c4..385c27e 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 @@ -961,7 +961,7 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 - * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java index a715a1d..e3e82aa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -49,20 +49,18 @@ public class MesPcnSyncCfg extends BaseBean { private Integer syncFrequency; @Column(name = "SYNC_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "同步时间") private String syncTime; - @Column(name = "SYNC_PATTERN")//2.新增 1.修改 - @ApiParam("同步方式") + @Column(name = "SYNC_PATTERN") + @ApiParam("同步方式 2.新增 1.修改") private Integer syncPattern; - @Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes - @ApiParam("同步类型") + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") private Integer syncType; @Column(name = "LAST_SYNC_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "上一同步时间") private String lastSyncTime; @@ -74,6 +72,10 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 7501970..7543670 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +28,9 @@ import javax.persistence.Table; @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean { + + private static final long serialVersionUID = 7270930330576127126L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; @@ -49,20 +52,18 @@ public class MesPcnSyncCfg extends BaseBean { private Integer syncFrequency; @Column(name = "SYNC_TIME") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "同步时间") private String syncTime; - @Column(name = "SYNC_PATTERN")//2、新增 1、修改 - @ApiParam("同步方式") + @Column(name = "SYNC_PATTERN") + @ApiParam("同步方式 2、新增 1、修改") private Integer syncPattern; - @Column(name = "SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes - @ApiParam("同步类型") + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") private Integer syncType; @Column(name = "LAST_SYNC_TIME") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "上一同步时间") private String lastSyncTime; @@ -74,6 +75,14 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + public int getIsIgnoreOrgVal() { + return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; + } + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java new file mode 100644 index 0000000..d60df26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -0,0 +1,64 @@ +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; +import javax.persistence.Transient; + +/** + * @Description : 车辆信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_CAR") +@Api("车辆信息") +public class WmsCar extends BaseBean { + + @Column(name="CAR_NO") + @ApiParam(value ="车牌号") + private String carNo; + + @Column(name="CAR_DESC") + @ApiParam(value ="车辆描述") + private String carDesc; + + @Column(name="MAX_CAPACITY") + @ApiParam(value ="载重量(KG)") + private String maxCapacity; + + @Column(name="DRIVER_NO") + @ApiParam(value ="默认驾驶员") + private String driverNo; + + @Column(name="PHONE") + @ApiParam(value ="车主电话") + private String phone; + + @Column(name="VENDOR_NO") + @ApiParam(value ="所属供应商") + private String vendorNo; + + @Transient + @ApiParam("司机名称") + private String driverNameRdd; + + @Transient + @ApiParam(value = "供应商名称") + private String vendorNameRdd; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java new file mode 100644 index 0000000..0ecea20 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -0,0 +1,63 @@ +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 : gcj + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_DRIVER") +@Api("驾驶员信息") +public class WmsTmsDriver extends BaseBean { + + @Column(name="DRIVER_NO") + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @Column(name="DRIVER_NAME") + @ApiParam(value ="驾驶员姓名") + private String driverName; + + @Column(name="SEX") + @ApiParam(value ="驾驶员性别") + private Integer sex; + + @Column(name="AGE") + @ApiParam(value ="驾驶员年龄") + private String age; + + @Column(name="ID_NO") + @ApiParam(value ="驾驶员身份证号") + private String idNo; + + @Column(name="ADRESS") + @ApiParam(value ="驾驶员籍贯") + private String adress; + + @Column(name="PHONE") + @ApiParam(value ="车牌号") + private String phone; + + @Column(name="LOGIN_NO") + @ApiParam(value =" 登录账号") + private String loginNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java new file mode 100644 index 0000000..9a65b4c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -0,0 +1,100 @@ +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 : gcj + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_SHIPPING_EXT") +@Api("装车单信息") +public class WmsTmsShippingExt extends BaseBean { + + @Column(name="MOVE_NO") + @ApiParam(value ="移库单号") + private String moveNo; + + @Column(name="DESTINATION") + @ApiParam(value ="到货地点") + private String destination; + + @Column(name="REC_USER") + @ApiParam(value ="接收人") + private String recUser; + + @Column(name="REC_PHONE") + @ApiParam(value ="接收人电话") + private String recPhone; + + @Column(name="DOCK_NO") + @ApiParam(value ="道口") + private String dockNo; + + @Column(name="VENDOR_NO") + @ApiParam(value ="承运商编号") + private String vendorNo; + + @Column(name="VENDOR_NAME") + @ApiParam(value ="承运商名称RDD") + private String vendorName; + + @Column(name="DRIVER_NO") + @ApiParam(value ="驾驶员编号") + private String driverNo; + + @Column(name="DRIVER_NAME") + @ApiParam(value ="驾驶员名称RDD") + private String driverName; + + @Column(name="PHONE") + @ApiParam(value ="驾驶员联系方式RDD") + private String phone; + + @Column(name="ORDER_STATUS") + @ApiParam(value ="单据状态") + private String orderStatus; + + @Column(name="CUST_NAME") + @ApiParam(value ="客户名称RDD") + private String custName; + + @Column(name="CUST_NO") + @ApiParam(value ="客户编号RDD") + private String custNo; + + @Column(name="CAR_NO") + @ApiParam(value ="车牌号RDD") + private String carNo; + + @Column(name="DELIVERY_TIME") + @ApiParam(value ="计划发车时间") + private String deliveryTime; + + @Column(name="ARRIVEL_TIME") + @ApiParam(value ="要求到货时间") + private String arrivelTime; + + @Column(name="DEPART") + @ApiParam(value =" 申请部门") + private String depart; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java new file mode 100644 index 0000000..b216934 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCar; +import org.springframework.stereotype.Repository; + +/** + * @Description : 车辆 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-04 15:29 + * @Modify: + **/ +@Repository +public interface WmsCarRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java new file mode 100644 index 0000000..bc6c1c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.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.WmsCar; +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver; +import org.springframework.stereotype.Repository; + +/** + * @Description : 驾驶员 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-04 15:29 + * @Modify: + **/ +@Repository +public interface WmsTmsDriverRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java new file mode 100644 index 0000000..a271bf3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.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.WmsTmsShippingExt; +import org.springframework.stereotype.Repository; + +/** + * @Description :装车单 + * @Reference : + * @Author : gcj + * @CreateDate : 2018-11-06 13:40 + * @Modify: + **/ +@Repository +public interface WmsTmsShippingExtRepository 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 ce2f35b..a6f89a5 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 @@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -2569,4 +2573,5 @@ public class WmsHqlPack { return result; } + }