From a76d70851d5204252bc14e2ca69de50e55d7b8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Dec 2019 19:17:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E9=80=82?= =?UTF-8?q?=E9=85=8D=E8=AE=B0=E5=BD=95=E5=8F=82=E6=95=B0=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index b1a9344..6bf3024 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; -import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; -import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import cn.estsh.i3plus.pojo.softswitch.bean.*; /** * @Description : @@ -415,7 +403,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); @@ -426,4 +413,12 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean); + + return ddlPackBean; + } } From 472adfd03c8638c37bb96bcca61b9a752962c388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 31 Dec 2019 10:41:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90KT-1339=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8B=89=E5=8A=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=8E=E4=BA=8E=E8=B5=B7=E8=AE=A2=E9=87=8F=E6=A6=82=E5=BF=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java | 73 ++++++++++++++++++++++ .../pojo/wms/repository/WmsZonePartRepository.java | 17 +++++ 2 files changed, 90 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java new file mode 100644 index 0000000..11d9020 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZonePart.java @@ -0,0 +1,73 @@ +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.ColumnDefault; +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 : jessica.chen + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ZONE_PART") +@Api("库区物料") +public class WmsZonePart extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592546L; + @Column(name="ZONE_NO") + @ApiParam("存储区编号") + private String zoneNo; + + @Column(name="PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PULL_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "拉动数量", example = "0") + private Double pullQty; + + @Column(name="MAX", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "最大值", example = "0") + private Double max; + + @Column(name="MIN", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "最小值", example = "0") + private Double min; + + @Column(name = "IS_GENERATE_PICKLIST") + @ApiParam(value = "是否生成领料单", example = "2") + private Integer isGeneratePickList; + + @Column(name="MOQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "起订量", example = "0") + private Double moq; + + @Column(name="SAFETY_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "安全量", example = "0") + private Double safetyQty; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.java new file mode 100644 index 0000000..ecfa631 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonePartRepository.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.BasCustomer; +import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart; +import org.springframework.stereotype.Repository; + +/** + * @Description :库区物料 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-12-30 17:27 + * @Modify: + **/ +@Repository +public interface WmsZonePartRepository extends BaseRepository { +} From 8a4aa9fed295b96a0870ef6f05784a2b3785382c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 31 Dec 2019 10:57:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?jis=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 40 +++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesJisPattern.java | 64 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 56 +++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 56 +++++++++++++++++++ .../mes/repository/MesJisPatternRepository.java | 16 ++++++ .../repository/MesQueueJisDetailRepository.java | 16 ++++++ .../pojo/mes/repository/MesQueueJisRepository.java | 16 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 26 +++++++++ 8 files changed, 287 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java 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 9c4d8f6..0bb09ea 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 @@ -17,9 +17,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_JIS_PATTERN_TYPE { - ONE(10, "一套发运"), - TRUE(20, "多套发运"), - FALSE(30, "单产品多套发运"); + ONE_PROD(10, "单产品发运"), + MANY_PROD(20, "多产品发运"); private int value; private String description; @@ -49,6 +48,41 @@ public class MesEnumUtil { } /** + * JIS发运产品组扫描顺序类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_SCAN_SEQ_TYPE { + ONE_PROD(10, "整发"), + MANY_PROD(20, "单发"); + + private int value; + private String description; + + MES_JIS_SCAN_SEQ_TYPE(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; + } + } + + /** * 是否解析 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java new file mode 100644 index 0000000..f3c9f89 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJisPattern.java @@ -0,0 +1,64 @@ +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 :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIS_PATTERN") +@Api("JIS发运模式") +public class MesJisPattern extends BaseBean { + + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + + @Column(name = "DESC") + @ApiParam("描述") + private String desc; + + @Column(name = "TOP_NO") + @ApiParam("一次显示TOP数") + private Integer topNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Column(name = "SCAN_SEQ_TYPE") + @ApiParam("产品组扫描顺序类型") + private Integer scanSeqType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java new file mode 100644 index 0000000..6f65fce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -0,0 +1,56 @@ +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 :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..db45636 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -0,0 +1,56 @@ +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 :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean { + + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.java new file mode 100644 index 0000000..11e0ba0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJisPatternRepository.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.MesJisPattern; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesJisPatternRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..f2a3a28 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisDetailRepository.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.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..30d8415 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJisRepository.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.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository 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 22f0c48..5fa2569 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 @@ -2098,5 +2098,31 @@ public class MesHqlPack { return packBean; } + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getScanSeqType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getScanSeqType(), "scanSeqType", packBean); + } + return packBean; + } + } From 05efdbb5681650eb7abaeee15fe51833c0f4896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 31 Dec 2019 11:33:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90KT-1339=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8B=89=E5=8A=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=8E=E4=BA=8E=E8=B5=B7=E8=AE=A2=E9=87=8F=E6=A6=82=E5=BF=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 ed53137..44b26b2 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 @@ -2660,4 +2660,21 @@ public class WmsHqlPack { return result; } + /** + * 库区物料信息分页查询条件 + * + * @param wmsZonePart + * @return + */ + public static DdlPackBean packHqlWmsZonePart(WmsZonePart wmsZonePart) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsZonePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsZonePart.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsZonePart, result); + + return result; + } + } From b0b671aac01dc388d1c8fd6963263811b1cab88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Dec 2019 14:18:24 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=80=82=E9=85=8D=E5=99=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index a798d8b..806c17b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamOmitField; @@ -90,6 +91,7 @@ public class SuitClientModel { /** * 适配报文 */ + @JsonIgnore @XStreamCDATA private Object suitResultMessage; From 2eb244c41cad4e52ad4277c1649a9fbb1da18d7e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 14:44:26 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 20 +++++++++++++++----- .../java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 5 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../src/main/resources/relations/Work.xml | 2 ++ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 72bec5a..472b69c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -36,12 +36,12 @@ import java.util.List; public class Work extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") - @FieldAnnotation(popSearch = true, mainkey = true) + @FieldAnnotation(popSearch = true, mainkey = true, modify = false) private String code; @Column(name="ORDER_ID") @ApiParam(value ="订单") - @FieldAnnotation(relation = "Order") + @FieldAnnotation(relation = "Order", modify = false) private Long orderId; @Column(name="WORK_TYPE") @@ -77,9 +77,10 @@ public class Work extends BaseAPS { @ApiParam(value ="指定数量") private Double specifyCount; - @Column(name="SPECIFY_RESOURCE") - @ApiParam(value ="指定资源") - private String specifyResource; + @Column(name="SPECIFY_RESOURCE_ID") + @ApiParam(value ="指定主资源") + @FieldAnnotation(relation = "SpecifyResource") + private Long specifyResourceId; @Column(name="SPECIFY_PRODUCE_TIME") @ApiParam(value ="指定制造时间") @@ -223,4 +224,13 @@ public class Work extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } + + public Resource getSpecifyResource() { + return BeanRelation.get(this, EWork.SpecifyResource); + } + + public void setSpecifyResource(Resource resource) { + this.specifyResourceId = resource != null ? resource.getId() : 0; + BeanRelation.set(this, EWork.SpecifyResource, resource); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index d63e4a4..455ae2c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer lockTime; + @Column(name="FORCE_POST_SET_ZERO") + @ApiParam(value ="是否将后设置时间强制设置成0") + @FieldAnnotation(property = false) + private Boolean forcePostSetZero; + @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 4a5e01f..1bfbecf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", modify = false) private Long materialId; @Column(name="PREV_ORDER_ID") @ApiParam(value ="前订单") - @FieldAnnotation(relation = "PrevOrder") + @FieldAnnotation(relation = "PrevOrder", modify = false) private Long prevOrderId; @Column(name="POST_ORDER_ID") @ApiParam(value ="后订单") - @FieldAnnotation(relation = "PostOrder") + @FieldAnnotation(relation = "PostOrder", modify = false) private Long postOrderId; @Column(name="PREV_WORK_ID") @ApiParam(value ="前工作") - @FieldAnnotation(relation = "PrevWork") + @FieldAnnotation(relation = "PrevWork", modify = false) private Long prevWorkId; @Column(name="POST_WORK_ID") @ApiParam(value ="后工作") - @FieldAnnotation(relation = "PostWork") + @FieldAnnotation(relation = "PostWork", modify = false) private Long postWorkId; @Column(name="COUNT", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 240fc04..c9befe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -12,4 +12,5 @@ public enum EWork { PlanFeedbacks, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 + SpecifyResource, // 指定资源 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 7e7253e..5c26770 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,4 +18,6 @@ + + \ No newline at end of file From 9627b6cf9ec420766d6d3f70f6bdc0eee9eca076 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 17:36:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java new file mode 100644 index 0000000..88cd06c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class GanttOrderModel { + private Long id; + private String code; + private String name; + private List children = new ArrayList<>(); +} From b29347c4097c5f8fb1cbeb769ecf556d7f29fcc1 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 31 Dec 2019 17:46:53 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index ca012e6..bdd8cc6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("关联单号") private String refOrderNo; + + @ApiParam("开始时间") + private String createDateTimeStart; + + @ApiParam("结束时间") + private String createDateTimeEnd; } From 011b4d220589484233ecec70f0d386cb64b6a24b Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 1 Jan 2020 00:32:43 +0800 Subject: [PATCH 9/9] =?UTF-8?q?zh20200101=20=E7=8E=B0=E5=9C=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20BI=20all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 5bc5ca1..9226c3a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean { public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode;