From d7ba3d445ad3eee5700030059dd0aa2db6986ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 5 Jun 2019 13:53:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?MES=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5-POJ?= =?UTF-8?q?O=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 37 ++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 41 +++++++++++++++ .../mes/pcn/repository/MesProcessRepository.java | 16 ++++++ .../mes/pcn/repository/MesRouteRepository.java | 16 ++++++ .../i3plus/pojo/mes/bean/MesPLCConfigure.java | 59 ++++++++++++++++++++++ ...uleReposity.java => MesKpsnRuleRepository.java} | 2 +- .../mes/repository/MesPLCConfigureRepository.java | 16 ++++++ 7 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesKpsnRuleReposity.java => MesKpsnRuleRepository.java} (79%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java new file mode 100644 index 0000000..2a88530 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROCESS") +@Api("工序") +public class MesProcess extends BaseBean { + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "PROCESS_NAME") + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java new file mode 100644 index 0000000..1a2949f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE") +@Api("流程表") +public class MesRoute extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java new file mode 100644 index 0000000..d931c12 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java new file mode 100644 index 0000000..92800fd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java new file mode 100644 index 0000000..be0c7ee --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.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 :PLC设备信息配置表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLC_CONFIGURE") +@Api("PLC设备信息配置表") +public class MesPLCConfigure extends BaseBean { + @Column(name="IP") + @ApiParam("设备ip") + private String ipAddress; + + @Column(name="CHANNEL_NAME") + @ApiParam("通道名称") + private String channelName; + + @Column(name="DEVICE_NAME") + @ApiParam("设备地址") + private String deviceName; + + @Column(name="TAG_NAME") + @ApiParam("标签地址") + private String tagName; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java similarity index 79% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java index 285b907..ae36d15 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesKpsnRuleReposity extends BaseRepository { +public interface MesKpsnRuleRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java new file mode 100644 index 0000000..af4c855 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPLCConfigureRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPLCConfigure; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPLCConfigureRepository extends BaseRepository { +} From 2b59998d169853629f8fda07e513a250999bc2d6 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 5 Jun 2019 13:54:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9Emes-pcn=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 80 ++++++++++++++++++++++ .../mes/repository/MesPcnSyncCfgRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 37 ++++++++++ 3 files changed, 133 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java 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 new file mode 100644 index 0000000..11aa97c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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: yiming.gu + * @CreateDate:2019-05-30-17:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_SYNC_CFG") +@Api("MES_PCN_同步配置") +public class MesPcnSyncCfg extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name="OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name="OBJECT_KEY") + @ApiParam("对象主键") + private String objectKey; + + @Column(name="SYNC_FREQUENCY") + @ApiParam("同步频率") + 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("同步方式") + private Integer syncPattern; + + @Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes + @ApiParam("同步类型") + private Integer syncType; + + @Column(name="LAST_SYNC_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value ="上一同步时间") + private String lastSyncTime; + + public int getSyncFrequencyVal() { + return this.syncFrequency == null ? 0 : this.syncFrequency; + } + + public int getSyncTypeVal() { + return this.syncType == null ? 0 : this.syncType; + } + + public int getSyncPatternVal() { + return this.syncPattern == null ? 0 : this.syncPattern; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java new file mode 100644 index 0000000..edf3fd1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncCfgRepository extends BaseRepository { +} 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 a11e846..0623bce 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 @@ -717,4 +717,41 @@ public class MesHqlPack { return packBean; } + + /** + * MES对象与dao对应关系查询条件封装 + * @param objectDao + * @return + */ + public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); + if (StringUtils.isNotEmpty(objectDao.getObjectCode())){ + DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean); + } + if (StringUtils.isNotEmpty(objectDao.getDaoClass())){ + DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean); + } + + return packBean; + } + + /** + * MES-PCN同步配置查询条件封装 + * @param pcnSyncCfg + * @return + */ + public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); + if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())){ + DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + } + if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())){ + DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + } + if (null != pcnSyncCfg.getSyncType()){ + DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); + } + + return packBean; + } } From b0faa179d1e766c25cdeb63ce6be0f4a43b7c7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 5 Jun 2019 19:42:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BB=8E=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E7=A7=BB=E5=85=A5?= =?UTF-8?q?=E5=88=B0=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E4=B8=AD?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0a3be6b..ddcddea 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 @@ -802,7 +802,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - FRAZE(70, "报废"), +// FRAZE(70, "报废"), COMMING(80, "在途"); private int value; @@ -847,7 +847,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"); + NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废"); private int value; private String code; From 507902473ca48e7192d6a39f114b6e88113c2c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 6 Jun 2019 11:12:09 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 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 0a3be6b..2f86c48 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 @@ -490,7 +490,10 @@ public class WmsEnumUtil { SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"), RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), - NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"); + NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"), + 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; private String code; From a5caf4eab57544ba5f92112fabc45b7203cff242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 6 Jun 2019 13:21:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80?= =?UTF-8?q?=E8=B4=A7=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 --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- 1 file changed, 3 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 1cc0505..249341d 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 @@ -483,7 +483,7 @@ public class WmsEnumUtil { SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), - SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"), + SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), @@ -491,10 +491,12 @@ public class WmsEnumUtil { RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), 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","线边报废出库"); + private int value; private String code; private String description; From 4fef723bdbbe3dc25918cba1cf7f769c2f48e30d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 6 Jun 2019 13:54:10 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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 ffb6744..7ed02fe 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 @@ -118,6 +118,30 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "是否散件", example = "1") private Integer isPart; + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String AssignSrcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String AssignSrcZoneNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String AssignDestWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String AssignDestZoneNo; + + @Column(name = "PLAN_DATE") + @ApiParam(value = "计划日期") + private String AssignPlanDate; + + @Column(name = "PLAN_TIME") + @ApiParam(value = "计划时间") + private String AssignPlanTime; + @Transient @ApiParam(value = "发运单号") private String shipOrderNo; From 94166da1ec277703694d6c85b39d311ac45bec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 6 Jun 2019 17:25:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81?= =?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/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 249341d..f04b9e2 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 @@ -807,7 +807,6 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), -// FRAZE(70, "报废"), COMMING(80, "在途"); private int value; @@ -2012,7 +2011,8 @@ public class WmsEnumUtil { RECEPTION(10, "RECEPTION", "让步接收"), SCRAP(20, "SCRAP", "报废"), QUARANTINE(30, "QUARANTINE", "隔离"), - BACK_QUARANTINE(40, "BACK_QUARANTINE", "反隔离"); + BACK_QUARANTINE(40, "BACK_QUARANTINE", "反隔离"), + DEFINITE_FAIL(50, "DEFINITE_FAIL", "不合格"); private int value; private String code;