From bd834a24cbb6b67f804475be9de3f0530f4f3770 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 5 Nov 2019 20:04:56 +0800 Subject: [PATCH 01/19] =?UTF-8?q?1:=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 12 ++++++ .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 5 +++ .../cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 50 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 16 +++++++ .../estsh/i3plus/pojo/aps/holders/EBaseRule.java | 4 ++ .../estsh/i3plus/pojo/aps/holders/ERuleDetail.java | 6 +++ .../estsh/i3plus/pojo/aps/holders/ERuleGroup.java | 5 +++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 1 + .../pojo/aps/repository/RuleDetailRepository.java | 9 ++++ .../src/main/resources/relations/RuleDetail.xml | 5 +++ .../src/main/resources/relations/RuleGroup.xml | 5 +++ 11 files changed, 118 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleDetailRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/RuleDetail.xml create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/RuleGroup.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 451a8f4..ff8a94e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -1,6 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; /** * @Description :规则基类 @@ -9,5 +15,11 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; * @CreateDate : 2019-09-17 * @Modify: **/ +@Data +@MappedSuperclass +@Api("规则参数基类") public class BaseRule extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="规则编码") + private String code; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 13689af..b350517 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.hibernate.annotations.Fetch; import javax.persistence.Column; import javax.persistence.Entity; @@ -39,6 +42,7 @@ public class MatCalcRule extends BaseRule { @Column(name="DEL_LIMIT") @ApiParam(value ="删除补充订单限制条件") + @FieldAnnotation(defaultValue = "NONE") private ORDER_DEL_LIMIT delLimit; @Column(name="KEEP_RELATION") @@ -55,6 +59,7 @@ public class MatCalcRule extends BaseRule { @Column(name="ASSIGN_LIMIT") @ApiParam(value ="物料分配制约") + @FieldAnnotation(editType = EDIT_TYPE.MULTI_ENUM, defaultValue = "NONE") private Integer assignLimit; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java new file mode 100644 index 0000000..78c5e4d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :规则组合下的规则明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-11-05 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_RULE_DETAIL") +@Api("规则明细") +public class RuleDetail extends BaseAPS { + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组合ID") + @FieldAnnotation(property = false) + private Long ruleGroupId; + + @Column(name="RULE_ID") + @ApiParam(value ="规则配置ID") + @FieldAnnotation(property = false) + private Long ruleId; + + RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } + + void setRuleGroup(RuleGroup ruleGroup) { + this.ruleGroupId = ruleGroup != null ? ruleGroup.getId() : 0; + BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup); + } + + BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); } + + void setRule(BaseRule rule) { + this.ruleId = rule != null ? rule.getId() : 0; + BeanRelation.set(this, ERuleDetail.Rule, rule); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 70eb6ad..6ad589e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -1,11 +1,17 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :规则组合 @@ -19,4 +25,14 @@ import javax.persistence.Table; @Table(name = "APS_RULE_GROUP") @Api("规则组合") public class RuleGroup extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + private String code; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + private Integer orderNumber; + + @JsonBackReference + List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java new file mode 100644 index 0000000..9753913 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EBaseRule { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java new file mode 100644 index 0000000..d63f726 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum ERuleDetail { + RuleGroup, + Rule +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java new file mode 100644 index 0000000..db3dba0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum ERuleGroup { + Details +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index f25c1f7..72aad17 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -12,6 +12,7 @@ import java.util.List; public class GanttCalendarModel { @Data public static class Block { + private Long resourceId; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date beginTime; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleDetailRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleDetailRepository.java new file mode 100644 index 0000000..497ea8a --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/RuleDetailRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.RuleDetail; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface RuleDetailRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/RuleDetail.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/RuleDetail.xml new file mode 100644 index 0000000..c306489 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/RuleDetail.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/RuleGroup.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/RuleGroup.xml new file mode 100644 index 0000000..bf4dafa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/RuleGroup.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 029c9b6bc802b178971aa1b5e13ef12f284e665a Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 6 Nov 2019 21:38:39 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++++++++++-------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 8 ++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 8 ++-- 5 files changed, 45 insertions(+), 24 deletions(-) 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 55323d9..fa79978 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 @@ -201,7 +201,7 @@ public class MesEnumUtil { } /** - * 设备台账报表查询标识 + * 设备台账报表查询标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EQUIPMENT_REPORT_TYPE { @@ -2587,37 +2587,50 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONFIG_TYPE { - FASTDFS_SAVE_PATH(10, "SAVE_PATH"), - NGINX_IP(20, "NGINX_HOST"), - MES_STATION_SOCKET(30, "mes_station_socket"), - GATEWAY_IP(40, "GATEWAY_HOST"), - UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), - PCN_PULL(60, "PCN_PULL"), - PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), - REWORK_REPAIR(90, "REWORK_REPAIR"); + FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), + NGINX_IP(20, "NGINX_HOST", ""), + MES_STATION_SOCKET(30, "MES_STATION_SOCKET", ""), + GATEWAY_IP(40, "GATEWAY_HOST", ""), + UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), + PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), + PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"), + FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR", ""), + OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"), + OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"), + OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"), + OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"), + OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), + SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""); + private int value; - private String description; + private String code; + private String cfgKey; - CONFIG_TYPE(int value, String description) { + CONFIG_TYPE(int value, String code, String cfgKey) { this.value = value; - this.description = description; + this.code = code; + this.cfgKey = cfgKey; } public int getValue() { return value; } - public String getDescription() { - return description; + public String getCode() { + return code; + } + + public String getCfgKey() { + return cfgKey; } 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; + tmp = values()[i].cfgKey; } } return tmp; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 6beeba3..2f172df 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -92,6 +92,10 @@ public class MesPlc extends BaseBean { @ApiParam("是否解析") private String isAnalysis; + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index ae8b814..e162d62 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户条码") private String custSn; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name="OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 1dd0077..5623665 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -94,6 +94,10 @@ public class MesPlc extends BaseBean { @ApiParam("是否解析") private String isAnalysis; + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index b00e8b6..4eed687 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -100,14 +100,14 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("客户条码") private String custSn; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Column(name = "CUST_PART_NO") @ApiParam("客户零件号") private String custPartNo; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name="OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; From 755e9205133d1e5ca0e0bc90e622ca3d6594b566 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 7 Nov 2019 15:55:56 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6250=20=E8=BF=94?= =?UTF-8?q?=E5=B7=A5=E8=BF=94=E4=BF=AE=E6=8B=86=E8=A7=A3=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java | 4 ++++ .../i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index ea4b34b..33b2402 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean { @ApiParam("备注") private String memo; + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + @Transient private String serialNumber; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 42840a9..1487bb8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -46,11 +46,13 @@ public class MesProdBindRecordModel { private String modifyDatetime; @ApiParam("产品条码") private String serialNumber; + @ApiParam("关联批次") + private String lotNo; public MesProdBindRecordModel() { } - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; @@ -64,9 +66,10 @@ public class MesProdBindRecordModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; this.dismantleQty = dismantleQty; + this.lotNo = lotNo; } - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) { + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; @@ -80,9 +83,10 @@ public class MesProdBindRecordModel { this.kpSn = kpSn; this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; + this.lotNo = lotNo; } - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) { + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; @@ -101,9 +105,10 @@ public class MesProdBindRecordModel { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; this.serialNumber = serialNumber; + this.lotNo = lotNo; } - public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) { + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { this.itemPartNo = itemPartNo; this.qty = qty; this.isValid = isValid; @@ -115,5 +120,6 @@ public class MesProdBindRecordModel { this.kpSn = kpSn; this.parentPartNo = parentPartNo; this.serialNumber = serialNumber; + this.lotNo = lotNo; } } From da582b871d8c97b806ffde9f107b2e077b366ff1 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 7 Nov 2019 17:12:56 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a2e6054..6c2d59d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1134,4 +1134,51 @@ public class CommonEnumUtil { // 数据未删除的静态常量 public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + /** + * 日志记录方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_DETAIL_SHOW_TYPE { + DEBUG(1, "DEBUG"), + OVER_TIME(2, "记录超时服务"), + ALL_METHOD(3, "所有服务"), + ALL_METHOD_PARAMETER(4, "所有服务和入参"); + + private int value; + private String description; + + private LOG_DETAIL_SHOW_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } From e26dadca0140ea9c2ed3a140b5689aea495756d9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 7 Nov 2019 17:30:24 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1162?= =?UTF-8?q?=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) 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 c95c425..4ab5bdd 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 @@ -2712,7 +2712,8 @@ public class MesEnumUtil { PCN_PUSH(70, "PCN_PUSH"), FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), REWORK_REPAIR(90, "REWORK_REPAIR"), - PCN_LOGIN(100, "PCN_LOGIN"); + PCN_LOGIN(100, "PCN_LOGIN"), + PCN_MENU(110, "PCN_MENU"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index f1e5193..e2dbc11 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -46,15 +46,6 @@ public class MesPcnSysUserOffline extends BaseBean { @ApiParam(value = "登陆名称", access = "登陆名称") private String loginName; - @Column(name = "ORGANIZE_ID") - @ApiParam(value = "部门ID", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long organizeId; - - @Column(name = "ORGANIZE_NAME") - @ApiParam(value = "部门名称", access = "部门名称") - private String organizeName; - @Column(name="USER_TYPE") @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") private Integer userType; From 6be9a55983b4d5dec790598a01f0a250d55e5a7f Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 Nov 2019 09:53:14 +0800 Subject: [PATCH 06/19] =?UTF-8?q?1:=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 14 +++++++--- .../pojo/aps/converter/CustomDateDeserializer.java | 25 +++++++++++++++++ .../pojo/aps/converter/CustomDateSerializer.java | 18 +++++++++++++ .../estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java | 22 +++++++++++++++ .../cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java | 8 ++++++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 31 ++++++++++------------ 9 files changed, 101 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 1eb5b9d..48942c2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -25,5 +25,6 @@ public @interface FieldAnnotation { String defaultValue() default ""; // 字段的默认值 boolean popSearch() default false; // 弹出选择对象时是否显示 EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型 + Class multiEnumClass() default Object.class; // 多选枚举的类型。 String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index ea3296d..e155d1e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -75,7 +75,7 @@ public class FieldInfo extends BaseCode { @Column(name="POSITION") @ApiParam(value ="位置") - private String position; + private Integer position; @Column(name="MAIN_KEY") @ApiParam(value ="主键标识") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 125255d..fd7bd8f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.CALENDAR_WEEK; import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -34,6 +35,7 @@ public class ResCalendar extends BaseAPS { @Column(name="WEEKS") @ApiParam(value ="星期") + @FieldAnnotation(multiEnumClass = CALENDAR_WEEK.class) private Integer weeks; @Column(name="DATES") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 78c5e4d..7ae8cbf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.RULE_TYPE; import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -24,6 +25,11 @@ import javax.persistence.Table; @Table(name = "APS_RULE_DETAIL") @Api("规则明细") public class RuleDetail extends BaseAPS { + + @Column(name="TYPE") + @ApiParam(value ="规则类型") + private RULE_TYPE type; + @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组合ID") @FieldAnnotation(property = false) @@ -34,16 +40,16 @@ public class RuleDetail extends BaseAPS { @FieldAnnotation(property = false) private Long ruleId; - RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } + public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } - void setRuleGroup(RuleGroup ruleGroup) { + public void setRuleGroup(RuleGroup ruleGroup) { this.ruleGroupId = ruleGroup != null ? ruleGroup.getId() : 0; BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup); } - BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); } + public BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); } - void setRule(BaseRule rule) { + public void setRule(BaseRule rule) { this.ruleId = rule != null ? rule.getId() : 0; BeanRelation.set(this, ERuleDetail.Rule, rule); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java new file mode 100644 index 0000000..20863b2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.converter; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; + +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class CustomDateDeserializer extends JsonDeserializer { + public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + @Override + public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { + try { + return DATETIME_FORMATOR.parse(jsonParser.getText()); + } catch (ParseException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java new file mode 100644 index 0000000..8b8780d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateSerializer.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.converter; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class CustomDateSerializer extends JsonSerializer { + public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + @Override + public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + jsonGenerator.writeString(DATETIME_FORMATOR.format(date)); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java new file mode 100644 index 0000000..2457263 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum CALENDAR_WEEK { + NONE(0), // 不进行任何制约 + MONDAY(1), // 星期一 + TUESDAY(2), // 星期二 + WEDNESDAY(4), // 星期三 + THURSDAY(8), // 星期四 + FRIDAY(16), // 星期五 + SATURDAY(32), // 星期六 + SUNDAY(64); // 星期天 + + private int _value; + + CALENDAR_WEEK(int value) { + _value = value; + } + + public int value() { + return this._value; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java new file mode 100644 index 0000000..3cfede4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RULE_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RULE_TYPE { + CANCEL_PLAN, + MAT_CALC, + HEURISTIC, + FIELD_SET +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 72aad17..06540a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -1,26 +1,23 @@ package cn.estsh.i3plus.pojo.aps.model; -import com.fasterxml.jackson.annotation.JsonFormat; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.List; @Data public class GanttCalendarModel { - @Data - public static class Block { - private Long resourceId; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginTime; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - private Boolean onDuty; - } - private Long resourceId; - private List timeBlocks = new ArrayList<>(); + private Long parent; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date start_date; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end_date; + private String color; + private Long id; + private String text; } From 8e614bcb725c6b1f9d453143d3899fbbce44f9a7 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 Nov 2019 09:55:20 +0800 Subject: [PATCH 07/19] =?UTF-8?q?1:=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java index 2457263..c89ca37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/CALENDAR_WEEK.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.aps.enums; public enum CALENDAR_WEEK { - NONE(0), // 不进行任何制约 MONDAY(1), // 星期一 TUESDAY(2), // 星期二 WEDNESDAY(4), // 星期三 From 5dc8ffb3943d195300168be7b91d517b325a80de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 8 Nov 2019 11:39:17 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=98=9F=E5=88=97V1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 41 ++++++++++++++++++++-- .../pojo/model/wms/WmsLogInfoSendToMqModel.java | 29 +++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 1 + 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java 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 ed412ca..5685375 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 @@ -626,8 +626,8 @@ public class WmsEnumUtil { VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_QC(290, "VDA_QC", "VDA质检"), - VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), - VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); + VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); private int value; @@ -2808,6 +2808,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 任务数据来源：检查子数据 */ @@ -3617,7 +3618,7 @@ public class WmsEnumUtil { LINE(10, "LINE", "产线"), CUSTOMER(20, "CUSTOMER", "客户"), VENDOR(30, "VENDOR", "供应商"), - BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错"); + BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING", "装箱防错"); private int value; private String code; @@ -3968,4 +3969,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 日志推送至MQ的处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_TO_MQ_HANDLE_TYPE { + INSERT(10, "新增"), UPDATE(20, "修改"), DELETE(30, "删除"); + + private int value; + private String description; + + LOG_TO_MQ_HANDLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java new file mode 100644 index 0000000..c6d2d19 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 操作日志信息推送至队列后台处理 + */ +@Data +public class WmsLogInfoSendToMqModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; + @ApiParam("处理类型") + private int handleType; + @ApiParam("日志对象DAO层") + private String baseRepository; + @ApiParam("日志对象（新增）") + private BaseBean logBean; + @ApiParam("查询条件名称（修改）") + private String[] conditionNames; + @ApiParam("查询条件值（修改）") + private Object[] conditionValues; + @ApiParam("更新条件名称（修改）") + private String[] updateNames; + @ApiParam("更新条件值（修改）") + private Object[] updateValues; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 0a90db5..208e2ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM_STATUS"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单明细信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3f75fd5..335aac9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_MASTER", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORDER_STATUS"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单主表信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index de05dbf..7785e93 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -28,6 +28,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), @Index(columnList = "ORGANIZE_CODE") }) From 71c867dd8cebc93291d113e68619b4d81ac01c75 Mon Sep 17 00:00:00 2001 From: 1111 Date: Fri, 8 Nov 2019 16:53:06 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E3=80=90=E5=8C=85=E8=A3=85=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++- .../i3plus/pojo/wms/bean/WmsContainerType.java | 51 ++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 64 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 13 +++++ .../estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 68 ++++++++++++++++++++++ .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 + .../wms/repository/WmsContainerTypeRepository.java | 16 +++++ .../wms/repository/WmsPackageSpecRepository.java | 17 ++++++ 8 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.java 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 457f5e5..c2b7c06 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 @@ -1970,7 +1970,8 @@ public class WmsEnumUtil { LOCATE(30, "LOCATE", "库位对象"), MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), - BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"); + BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); private String code; private String description; @@ -2311,6 +2312,56 @@ public class WmsEnumUtil { return tmp; } } + /** + * NC处理 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUSI_OPERATION_TYPE { + //收货改数 + GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ; + + private int value; + private String code; + private String description; + + BUSI_OPERATION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 盘点物料 是否调差 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java new file mode 100644 index 0000000..c14e979 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; +import javax.persistence.Transient; + +/** + * @Description :容器类型 + * @Reference : + * @Author : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_CONTAINER_TYPE") +@Api("容器类型") +public class WmsContainerType extends BaseBean { + private static final long serialVersionUID = 4849044986767609347L; + @Column(name = "CT_CODE",unique = true) + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java new file mode 100644 index 0000000..c39a72c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.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 : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PACKAGE_SPEC") +@Api("包装规格") +public class WmsPackageSpec extends BaseBean { + private static final long serialVersionUID = 4849044986767609445L; + @Column(name = "SPEC_CODE",unique = true) + @ApiParam(value = "包装规格代码") + private String specCode; + + @Column(name = "SPEC_NAME") + @ApiParam(value = "包装规格名称") + private String specName; + + @Column(name = "QTY") + @ApiParam(value = "包装数量") + private Double qty; + + @Column(name = "PARENT_SPEC") + @ApiParam(value = "上级规格") + private String parentSpec; + + @Column(name = "SPEC_LEVEL") + @ApiParam(value = "规格层级") + private String specLevel; + + @Column(name = "IS_MIXED") + @ApiParam(value = "是否混包") + private Integer isMixed; + + + @Column(name = "POCKET_TYPE") + @ApiParam(value = "默认容器类型") + private String pocketType; + + @ApiParam(value = "上级规格名称") + @Transient + private String parentName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index d44f335..5f720bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -190,6 +190,19 @@ public class WmsPart extends BaseBean { public WmsPart() { } + public Double getQty() { + return qty == null? 0:qty; + } + + public Double getMin() { + return min == null? 0: min; + } + + public Double getMax() { + return max == null? 0:max; + } + + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; this.partName = partName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java new file mode 100644 index 0000000..2b66b42 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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 : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_PACKAGE") +@Api("物料包装关系") +public class WmsPartPackage extends BaseBean { + private static final long serialVersionUID = 4849044986767609345L; + @Column(name = "PART_NO",unique = true) + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "SPEC_CODE") + @ApiParam(value = "包装规格代码") + private String specCode; + + @Column(name = "SNP_QTY") + @ApiParam(value = "单包装数量") + private String snpQty; + + @Column(name = "BOX_QTY") + @ApiParam(value = "包装箱数") + private String boxQty; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认包规") + private String isDefault; + + @Column(name = "IS_MIXED") + @ApiParam(value = "是否混包") + private String isMixed; + + @Column(name = "IS_PRINT") + @ApiParam(value = "是否打印包装清单") + private String isPrint; + + @Column(name = "TEMPLATE_NO") + @ApiParam(value = "包装清单模板") + private String templateNo; + + @Column(name = "POCKET_TYPE") + @ApiParam(value = "容器类型") + private String pocketType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 2079deb..9cd45da 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -45,6 +45,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiTypeList; + @ApiParam("业务类型列表") + private List busiOperationTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java new file mode 100644 index 0000000..8c3f4da --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.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.WmsContainerType; +import org.springframework.stereotype.Repository; + +/** +* @Description :容器类型Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsContainerTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.java new file mode 100644 index 0000000..461ef5a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.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.WmsContainerType; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackageSpec; +import org.springframework.stereotype.Repository; + +/** +* @Description :包装规格Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsPackageSpecRepository extends BaseRepository { +} From b4cea27a5b60d3f64456f7310a2d6d89a640f1aa Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 8 Nov 2019 17:19:41 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index 645c2d5..ca13bc4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b294abe..74ea5d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + } From 58c9795b7c7e835faa52c4ffa8cca204e2eb2b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 8 Nov 2019 18:01:16 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 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 3ae0e7f..57d06eb 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 @@ -543,7 +543,8 @@ public class WmsEnumUtil { IN_STORE(10, "IN", "入库"), OUT_STORE(20, "OUT", "出库"), MOVE_STORE(30, "MOVE", "移库"), - OTHER(40, "OTHER", "其他"); + OTHER(40, "OTHER", "其他"), + NC_HANDLE(50, "NC_HANDLE", "NC处理"); private int value; private String code; @@ -627,7 +628,16 @@ public class WmsEnumUtil { VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_QC(290, "VDA_QC", "VDA质检"), VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), - VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), + KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), + KT_SCRAP(330, "KT_SCRAP", "KT报废"), + KT_QUARANTINE(330, "KT_QUARANTINE", "KT报废"), + KT_BACK_QUARANTINE(340, "KT_BACK_QUARANTINE", "KT反隔离"), + KT_DEFINITE_FAIL(350, "KT_DEFINITE_FAIL", "KT不合格"), + KT_RETURN(360, "KT_RETURN", "KT退货"), + KT_REWORK(370, "KT_REWORK", "KT返工"), + KT_MISCALCULATION(380, "KT_MISCALCULATION", "KT误判"), + KT_SORTING(390, "KT_SORTING", "KT分选"); private int value; From 84bf5ba64a023d027f133893e7fd4fd4fb640610 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 8 Nov 2019 18:39:20 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1162?= =?UTF-8?q?=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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 8908c3e..6da43d5 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 @@ -2719,7 +2719,8 @@ public class MesEnumUtil { OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""), PCN_LOGIN(160, "PCN_LOGIN",""), - PCN_MENU(170, "PCN_MENU",""); + PCN_MENU(170, "PCN_MENU",""), + PCN_MODULE(180, "PCN_MODULE",""); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index e2dbc11..53fad7f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -51,8 +51,18 @@ public class MesPcnSysUserOffline extends BaseBean { private Integer userType; @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob @Column(name="MENU_LIST") @ApiParam(value ="菜单" , access ="菜单") private String menuList; + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + } From 5fd619ac799c1dc824ca979848e6a5e8180c94c5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 8 Nov 2019 20:36:33 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E3=80=90bug=EF=BC=9A5791=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95=E6=98=8E=E7=BB=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 + .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 ++- 3 files changed, 108 insertions(+), 2 deletions(-) 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 4ab5bdd..ab235ea 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 @@ -14,6 +14,101 @@ public class MesEnumUtil { /** + * Mes 对象结构是否保存 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORGANIZATION_INIT_DATA { + + MES_CONFIG("MesConfig", "MES_CONFIG", "配置表"), + MES_NUMBER_RULE("MesNumberRule", "MES_NUMBER_RULE", "编码规则表"), + MES_STEP("MesStep", "MES_STEP", "工步"), + MES_STEP_PARAM("MesStepParam", "MES_STEP_PARAM", "工步参数表"), + MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"), + MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"), + MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"), + MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"), + MES_EVENT("MesEvent", "MES_EVENT", "事件清单"), + MES_METHOD("MesMethod", "MES_METHOD", "方法清单"), + MES_ACTION("MesAction", "MES_ACTION", "动作"), + MES_EVENT_ACTION("MesEventAction", "MES_EVENT_ACTION", "事件动作配置"), + MES_ACTION_METHOD("MesActionMethod", "MES_ACTION_METHOD", "动作方法配置"); + + private String value; + private String code; + private String description; + + ORGANIZATION_INIT_DATA(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + // 根据value返回枚举类型,主要在switch中使用 + public static ORGANIZATION_INIT_DATA getByValue(String value) { + for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { + if (mesInsertExcel.getValue().equals(value)) { + return mesInsertExcel; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * Mes 对象结构是否保存 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CFG_IS_SAVE { + + SAVE(1, "存储"), + NO_SAVE(2, "不存储"); + + private int value; + private String description; + + OBJECT_CFG_IS_SAVE(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 客户订单来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b294abe..b38c717 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否存储") + private Integer isSave; + } 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 514f70f..a7666ba 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 @@ -1718,11 +1718,14 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesCustOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesCustOrder.getOrderNo(), "orderNo", packBean); + } if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) { - DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean); + DdlPreparedPack.getStringLikerPack(mesCustOrder.getCustCode(), "custCode", packBean); } if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean); } if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean); @@ -1737,6 +1740,10 @@ public class MesHqlPack { mesCustOrder.getOrderTimeStart(), mesCustOrder.getOrderTimeEnd(), "orderDate", packBean, true); + DdlPreparedPack.timeBuilder( + mesCustOrder.getCreateDateTimeStart(), + mesCustOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); return packBean; } } From 7378df1b9e6a9429a85cf260554e479aca4e2027 Mon Sep 17 00:00:00 2001 From: 1111 Date: Sat, 9 Nov 2019 11:53:57 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 +++++++++++++++++++--- .../i3plus/pojo/wms/bean/WmsContainerType.java | 2 +- .../estsh/i3plus/pojo/wms/dto/PartPackagDto.java | 27 +++++++++++++++ .../cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java | 12 +++++++ .../wms/repository/WmsPartPackageRepository.java | 17 +++++++++ 5 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java 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 f0f21ca..29b40bd 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 @@ -3548,10 +3548,7 @@ public class WmsEnumUtil { public enum REC_STATUS { UNRECEIVED("UNRECEIVED", "未收货"), COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), - PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), - OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), - OTHER("ELSE", "其他"), - ; + PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"); private String value; private String description; @@ -4057,4 +4054,39 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 日志推送至MQ的处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPEC_LEVEL { + FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层"); + + private int value; + private String description; + + SPEC_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index c14e979..78f240d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -19,7 +19,7 @@ import javax.persistence.Transient; /** * @Description :容器类型 * @Reference : - * @Author : 容器类型 + * @Author : gcj * @CreateDate : 2019-11-07 16:06 * @Modify: **/ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java new file mode 100644 index 0000000..812dda1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description :物料包装关系入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Api("物料包装关系入参") +public class PartPackagDto{ + + @ApiParam(value = "物料编码") + private String partNo; + @ApiParam(value = "工厂代码") + private List partPackages; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java index ace266b..0adf02a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java @@ -2,15 +2,27 @@ package cn.estsh.i3plus.pojo.wms.dto; import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +/** + * @Description :库存预警入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ @Data @Api("库存预警入参") public class QuanWarnDto extends Pager { + @ApiParam(value = "工厂代码") private String organizeCode; + @ApiParam(value = "是否选择") private Integer checked; + @ApiParam(value = "物料编码") private String partNo; + @ApiParam(value = "物料类型") private String partType; public Integer getChecked() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java new file mode 100644 index 0000000..69075b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.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.WmsPackageSpec; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage; +import org.springframework.stereotype.Repository; + +/** +* @Description :包装关系Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsPartPackageRepository extends BaseRepository { +} From 43e400d3547617ec8a46a640183aded64fe457e0 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 8 Nov 2019 22:09:29 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E6=9B=B4=E6=94=B9BigDecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 3af434a..e19e6e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.math.BigDecimal; import java.util.Date; /** @@ -2284,7 +2285,7 @@ public class BlockFormEnumUtil { LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), - BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), + BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss"); From 94dc90172da9179bb6bfb4dbbd6aeaf715280b89 Mon Sep 17 00:00:00 2001 From: lpx Date: Sat, 9 Nov 2019 20:19:00 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E3=80=90=E6=89=AB=E6=8F=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=91bug6246?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index b5d15ec..31afeb8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -233,14 +233,14 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) { + public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double destQty) { this.partNo = partNo; this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.createUser = createUser; this.createDatetime = createDatetime; this.busiTypeCode = busiTypeCode; - this.qty = qty; + this.destQty = destQty; } public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, From 62bb71f4b068d7880c2906dd9e1eafb4ba88822e Mon Sep 17 00:00:00 2001 From: qianhs Date: Sun, 10 Nov 2019 10:39:08 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E3=80=90EU=E7=9B=98=E7=82=B9=E3=80=91?= =?UTF-8?q?=E3=80=90=20317-EU=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=B7=AE=E5=BC=82=E6=9F=A5=E8=AF=A2=E3=80=91=E3=80=901148EU?= =?UTF-8?q?=E7=9B=98=E7=82=B9-=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 8 ++-- .../pojo/wms/modelbean/WmsStaticCsModel.java | 43 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java 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 8613139..b234922 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 @@ -637,7 +637,9 @@ public class WmsEnumUtil { KT_RETURN(360, "KT_RETURN", "KT退货"), KT_REWORK(370, "KT_REWORK", "KT返工"), KT_MISCALCULATION(380, "KT_MISCALCULATION", "KT误判"), - KT_SORTING(390, "KT_SORTING", "KT分选"); + KT_SORTING(390, "KT_SORTING", "KT分选"), + VDA_STATIC_CS(320,"VDA_STATIC_CS", "静态盘点"), + VDA_CS_SEARCH(340,"VDA_CS_SEARCH", "VDA盘点查询") ; private int value; @@ -818,8 +820,8 @@ public class WmsEnumUtil { VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), VDA_SN_("VDA_SN_MERGE", "VDA条码合并"), VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"), - VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"); - + VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询"), + VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java new file mode 100644 index 0000000..660d2a2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Entity; + +/** + * @Description : 静态盘点输出model + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-10-31 20:04 + * @Modify: + **/ +@Data +@Entity +@Api("静态盘点查询输出model") +public class WmsStaticCsModel extends BaseBean { + public WmsStaticCsModel(String staticStr,String orderNo, String locateNo, String sn, double qty ) { + this.orderNo = orderNo; + this.locateNo = locateNo; + this.sn = sn; + this.qty = qty; + this.staticStr = staticStr; + } + + @ApiParam(value = "订单号") + private String orderNo; + @ApiParam(value = "库存号") + private String locateNo; + @ApiParam(value = "条码") + private String sn; + @ApiParam(value = "数量") + private double qty; + @ApiParam(value = "状态") + private String staticStr; + + public WmsStaticCsModel() { + + } +} From 99947f284e22ecf7d4818ee1461894a37177b09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 11 Nov 2019 09:33:22 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9--?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 57d06eb..32b0c8c 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 @@ -631,13 +631,13 @@ public class WmsEnumUtil { VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), KT_SCRAP(330, "KT_SCRAP", "KT报废"), - KT_QUARANTINE(330, "KT_QUARANTINE", "KT报废"), - KT_BACK_QUARANTINE(340, "KT_BACK_QUARANTINE", "KT反隔离"), - KT_DEFINITE_FAIL(350, "KT_DEFINITE_FAIL", "KT不合格"), - KT_RETURN(360, "KT_RETURN", "KT退货"), - KT_REWORK(370, "KT_REWORK", "KT返工"), - KT_MISCALCULATION(380, "KT_MISCALCULATION", "KT误判"), - KT_SORTING(390, "KT_SORTING", "KT分选"); + KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"), + KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"), + KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"), + KT_RETURN(370, "KT_RETURN", "KT退货"), + KT_REWORK(380, "KT_REWORK", "KT返工"), + KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"), + KT_SORTING(400, "KT_SORTING", "KT分选"); private int value; From 7b88c605baea549cee1485c0983b1550b5d85aa9 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 11 Nov 2019 09:38:19 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9=2010?= =?UTF-8?q?60?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 8908c3e..8bf00f2 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 @@ -2705,7 +2705,7 @@ public class MesEnumUtil { FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), NGINX_IP(20, "NGINX_HOST", ""), - MES_STATION_SOCKET(30, "MES_STATION_SOCKET", ""), + MES_STATION_SOCKET(30, "mes_station_socket", ""), GATEWAY_IP(40, "GATEWAY_HOST", ""), UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), @@ -2724,12 +2724,12 @@ public class MesEnumUtil { private int value; private String code; - private String cfgKey; + private String description; - CONFIG_TYPE(int value, String code, String cfgKey) { + CONFIG_TYPE(int value, String code, String description) { this.value = value; this.code = code; - this.cfgKey = cfgKey; + this.description = description; } public int getValue() { @@ -2740,15 +2740,15 @@ public class MesEnumUtil { return code; } - public String getCfgKey() { - return cfgKey; + 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].cfgKey; + tmp = values()[i].description; } } return tmp;