diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 11691be..697131c 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
index 2e8c77e..edaab1e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
@@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable {
@ApiParam(value = "事件描述")
private String acCode;
+ @AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
+ @AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "呼叫原因描述")
private String acName;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
index c677396..47588b4 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
@@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
+ @ApiModelProperty("默认异常入库")
+ private boolean errorInsertFlag = true;
+
}
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 8ef99a3..f902a7c 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
index e597af8..0b1ec28 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@@ -65,10 +65,10 @@ public class Material extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String purchaseLeadTime;
- @Column(name="MANUF_LEAD_TIME")
+ @Column(name="PRODUCT_LEAD_TIME")
@ApiParam(value ="生产提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
- private String manufLeadTime;
+ private String productLeadTime;
@Column(name="SHIPMENT_LEAD_TIME")
@ApiParam(value ="配送提前期")
@@ -79,9 +79,9 @@ public class Material extends BaseAPS {
@ApiParam(value ="单位采购量")
private Integer unitPurchase;
- @Column(name="UNIT_MANUF")
+ @Column(name="UNIT_PRODUCT")
@ApiParam(value ="单位生产量")
- private Integer unitManuf;
+ private Integer unitProduct;
@Column(name="UNIT_SHIPMENT")
@ApiParam(value ="单位配送量")
@@ -109,7 +109,7 @@ public class Material extends BaseAPS {
@Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="生产批量单位")
- private Double UnitProductBatch;
+ private Double unitProductBatch;
@Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大采购批量")
@@ -143,6 +143,14 @@ public class Material extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String orderBatchPeriod;
+ @Column(name="LABEL_NAME")
+ @ApiParam(value ="标签名称")
+ private String labelName;
+
+ @Column(name="LABEL_COLOR")
+ @ApiParam(value ="标签颜色")
+ private String labelColor;
+
@JsonBackReference
public List getProductRoutings() {
return BeanRelation.list(this, EMaterial.ProductRoutings);
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
new file mode 100644
index 0000000..dcb7f0b
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
+@Api("物料")
+public class MaterialDeliveryPromise extends BaseBean {
+ @Column(name="QTY")
+ @ApiParam(value ="到货数量")
+ private Double count;
+
+ @Column(name="DATE_TIME")
+ @ApiParam(value ="到货日期")
+ private Date dateTime;
+
+ @Column(name="MATERIAL_ID")
+ @ApiParam(value ="物料")
+ @FieldAnnotation(relation = "Material", notEmpty = true)
+ private Long materialId;
+
+ public Material getMaterial() {
+ return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
+ }
+
+ public void setMaterial(Material material) {
+ this.materialId = material != null ? material.getId() : 0l;
+ BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
+ }
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
index 7baa32a..bd8679a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
@@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder {
@FieldAnnotation(modify = false)
private String calcLeadTime;
+ @Column(name="ALLOW_DELAY_TIME")
+ @ApiParam(value ="允许延期时间")
+ @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+ private String allowDelayTime;
+
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);
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 9b898b5..619bbf8 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
@@ -84,7 +84,7 @@ public class Work extends BaseAPS {
private Long specifyResourceId;
@Column(name="SPECIFY_PRODUCE_TIME")
- @ApiParam(value ="指定制造时间")
+ @ApiParam(value ="指定生产时间")
private String specifyProduceTime;
@Column(name="SPECIFY_PREV_TIME")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
index 0cd8116..a440ae8 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
@@ -388,7 +388,9 @@ public class BeanRelation {
List relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
- recursionImpl(relaBean, fun, holders, index + 1);
+ if (relaBean.getId() != bean.getId()) {
+ recursionImpl(relaBean, fun, holders, index + 1);
+ }
}
}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
index 0e529ea..6d1814a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
@@ -29,6 +29,10 @@ public class DateDuration {
private double rate = 0.0;
private boolean bValid = false;
+ public DateDuration(int value) {
+ this.time = value;
+ }
+
public DateDuration(String value) {
setValue(value);
}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java
new file mode 100644
index 0000000..abc6ec5
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java
@@ -0,0 +1,5 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EMaterialDeliveryPromise {
+ Material,
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java
new file mode 100644
index 0000000..540a328
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 延期订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class DelaySalesOrder {
+
+ @ApiParam(value ="订单ID")
+ private Long orderId;
+
+ @ApiParam(value ="订单编码")
+ private String orderCode;
+
+ @ApiParam(value ="订单名称")
+ private String orderName;
+
+ @ApiParam(value ="物料编码")
+ private String materialCode;
+
+ @ApiParam(value ="物料名称")
+ private String materialName;
+
+ @ApiParam(value ="订单数量")
+ private Double count;
+
+ @ApiParam(value ="最晚结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date let;
+
+ @ApiParam(value ="计划开始时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planStart;
+
+ @ApiParam(value ="计划结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planEnd;
+
+ @ApiParam(value ="总跨度时间")
+ private String overTime;
+
+ @ApiParam(value ="总生产时间")
+ private String productTime;
+
+ @ApiParam(value ="延期时间")
+ private String delayTime;
+
+ @ApiParam(value ="允许的最大延期时间")
+ private String allowDelayTime;
+
+ // 0正常显示，1显示黄色，2显示红色
+ @ApiParam(value ="背景显示颜色")
+ private Integer backgroundColor;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java
new file mode 100644
index 0000000..5ddc2dd
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 大跨度订单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class LargeSpanOrder {
+ @ApiParam(value ="订单ID")
+ private Long orderId;
+
+ @ApiParam(value ="订单编码")
+ private String orderCode;
+
+ @ApiParam(value ="订单名称")
+ private String orderName;
+
+ @ApiParam(value ="物料编码")
+ private String materialCode;
+
+ @ApiParam(value ="物料名称")
+ private String materialName;
+
+ @ApiParam(value ="订单数量")
+ private Double count;
+
+ @ApiParam(value ="最晚结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date let;
+
+ @ApiParam(value ="计划开始时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planStart;
+
+ @ApiParam(value ="计划结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planEnd;
+
+ @ApiParam(value ="总跨度时间")
+ private String overTime;
+
+ @ApiParam(value ="总生产时间")
+ private String productTime;
+
+ @ApiParam(value ="跨度时间")
+ private String spanTime;
+
+ // 0正常显示，1显示黄色，2显示红色
+ @ApiParam(value ="背景显示颜色")
+ private Integer backgroundColor;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java
new file mode 100644
index 0000000..c7a0500
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 物料交期分析表
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class MaterialDeliveryAnalyze {
+ @ApiParam(value ="订单ID")
+ private Long orderId;
+
+ @ApiParam(value ="订单编码")
+ private String orderCode;
+
+ @ApiParam(value ="订单名称")
+ private String orderName;
+
+ @ApiParam(value ="物料编码")
+ private String materialCode;
+
+ @ApiParam(value ="物料名称")
+ private String materialName;
+
+ @ApiParam(value ="标签名称")
+ private String labelName;
+
+ @ApiParam(value ="标签颜色")
+ private String labelColor;
+
+ @ApiParam(value ="需求数量")
+ private Double requireCount;
+
+ @ApiParam(value ="需求日期")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date requireDate;
+
+ @ApiParam(value ="最早到货日期")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date arrivalDate;
+
+ // 0正常显示，1显示红色
+ @ApiParam(value ="背景显示颜色")
+ private Integer backgroundColor;
+
+ private Double count;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java
new file mode 100644
index 0000000..4080aa9
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 过早生产
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class PrematureProduct {
+ @ApiParam(value ="订单ID")
+ private Long orderId;
+
+ @ApiParam(value ="订单编码")
+ private String orderCode;
+
+ @ApiParam(value ="订单名称")
+ private String orderName;
+
+ @ApiParam(value ="物料编码")
+ private String materialCode;
+
+ @ApiParam(value ="物料名称")
+ private String materialName;
+
+ @ApiParam(value ="订单编码")
+ private Double count;
+
+ @ApiParam(value ="最晚结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date let;
+
+ @ApiParam(value ="计划开始时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planStart;
+
+ @ApiParam(value ="计划结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planEnd;
+
+ @ApiParam(value ="提前完成时间")
+ private String times;
+
+ // 0正常显示，1显示红色
+ @ApiParam(value ="背景显示颜色")
+ private Integer backgroundColor;
+
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java
new file mode 100644
index 0000000..7692b3d
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+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 io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description : 排程结果分析及建议
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
+@Data
+public class ScheduleAnalyze {
+
+ @ApiParam(value ="工作编码")
+ private String workCode;
+
+ @ApiParam(value ="数量")
+ private Double count;
+
+ @ApiParam(value ="计划开始时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planStart;
+
+ @ApiParam(value ="计划结束时间")
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date planEnd;
+
+ @ApiParam(value ="问题描述")
+ private String describe;
+
+ @ApiParam(value ="解决方案")
+ private String solution;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java
new file mode 100644
index 0000000..afe26b8
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MaterialDeliveryPromiseRepository extends CrudRepository {
+}
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml
new file mode 100644
index 0000000..310c255
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 577686d..d2521de 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
index b961226..0a90b00 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
@@ -31,6 +31,27 @@ public class Pager {
@ApiParam("翻页操作")
private String pageMethod;
+ /* 默认最小数量分页 */
+ private static final Pager min;
+ /* 默认最大数量分页 */
+ private static final Pager max;
+ /* 默认数量分页 */
+ private static final Pager defaultPager;
+
+ static {
+ min = new Pager();
+ min.setCurrentPage(1);
+ min.setPageSize(10);
+
+ max = new Pager();
+ max.setCurrentPage(1);
+ max.setPageSize(65535);
+
+ defaultPager = new Pager();
+ defaultPager.setCurrentPage(1);
+ defaultPager.setPageSize(100);
+ }
+
public Pager() {
}
@@ -231,6 +252,30 @@ public class Pager {
return currentPage > 1;
}
+ /**
+ * 获取默认最小分页数量
+ * @return
+ */
+ public static Pager defaultMinPager(){
+ return min;
+ }
+
+ /**
+ * 默认最大分页数量
+ * @return
+ */
+ public static Pager defaultMaxPager(){
+ return max;
+ }
+
+ /**
+ * 默认分页数量
+ * @return
+ */
+ public static Pager defaultPager(){
+ return defaultPager;
+ }
+
@Override
public String toString() {
return "Pager{" +
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
index b1738c3..a5c3a42 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
@@ -1,22 +1,33 @@
package cn.estsh.i3plus.pojo.base.common;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
+import com.alibaba.fastjson.JSON;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.core.util.QuickWriter;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.naming.NameCoder;
import com.thoughtworks.xstream.io.naming.NoNameCoder;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XppDomDriver;
+import lombok.Data;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.io.Serializable;
import java.io.Writer;
import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toJavaBean;
+import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toXml;
/**
* @Description : Xml 工厂
- * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
+ * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-7-23 下午5:58
@@ -120,9 +131,9 @@ public class XStreamFactory {
}
-
/**
* Javabean 转XML
+ *
* @param
* @return xml字符串
*/
@@ -132,8 +143,8 @@ public class XStreamFactory {
for (int i = 1; i < RETRY_NUM; i++) {
try {
return headLine + xStream.toXML(t);
- }catch (Exception e){
- LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i);
+ } catch (Exception e) {
+ LOGGER.error("Bean To Xml Error Message:{} Number:{}", e.getMessage(), i);
}
}
return null;
@@ -141,6 +152,7 @@ public class XStreamFactory {
/**
* Javabean 转XML
+ *
* @param
* @return xml字符串
*/
@@ -159,101 +171,108 @@ public class XStreamFactory {
public static T toJavaBean(String xmlStr) {
return (T) xStream.fromXML(xmlStr);
}
-//
-// public static void main(String[] args) {
-// User u = new User(0, "zhangsan0", "zhangsanpwd0");
-// User u1 = new User(1, "zhangsan1", "zhangsanpwd");
-// User u2 = new User(2, "zhangsan2", "zhangsanpwd");
-// User u3 = new User(3, "zhangsan3", "zhangsanpwd");
-//
-// Role r1 = new Role(1, "Admin", "Admin1");
-// Role r2 = new Role(2, "Admin", "Admin2");
-// Role r3 = new Role(3, "Admin", "Admin3");
-//
-// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1);
-// u1.setRole(r1);
-//
-// u2.getRoleList().add(r1);
-// u2.getRoleList().add(r2);
-// u2.getRoleList().add(r3);
-//
-// u3.setRole(r1);
-// u3.getRoleList().add(r2);
-// u3.getRoleList().add(r3);
-//
-// System.out.println(toXml(u) + "\n\n ");
-// System.out.println(toXml(u1) + "\n\n ");
-// System.out.println(toXml(u2) + "\n\n ");
-// System.out.println(toXml(u3) + "\n\n ");
-// System.out.println(toXml(ad) + "\n\n ");
-//
-// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad))));
-//
-// }
}
+
//
-//@Data
-//@XStreamAlias("DataAdapter")
-////对应carInfos元素
-//class DataAdapter implements Serializable {
-//
-// @XStreamAsAttribute
-// private Long scId;
-// private String key;
-// @XStreamCDATA
-// private String resultData;
-//
-// private Object auth;
-//
-// public DataAdapter(Long scId, String key, String resultData, Object auth) {
-// this.scId = scId;
-// this.key = key;
-// this.resultData = resultData;
-// this.auth = auth;
-// }
-//}
-//
-//@Data
-//@XStreamAlias("user")
-////对应carInfos元素
-//class User implements Serializable {
-// private static final long serialVersionUID = -7554548655397869156L;
-//
-// @XStreamAsAttribute
-// private Integer id;
-// private String loginName;
-// private String loginPwd;
-//
-// private Role role;
-// private List roleList = new ArrayList();
-// private List roleArray;
-//
-// public User() {
-// }
-//
-// public User(Integer id, String loginName, String loginPwd) {
-// this.id = id;
-// this.loginName = loginName;
-// this.loginPwd = loginPwd;
-// }
-//}
-//
-//@Data
-//@XStreamAlias("role")
-////对应carInfos元素
-//class Role implements Serializable {
-// private static final long serialVersionUID = -3134157833696958743L;
-// @XStreamAsAttribute
-// private Integer id;
-// private String roleName;
-// private String roleCode;
-//
-// public Role() {
-// }
-//
-// public Role(Integer id, String roleName, String roleCode) {
-// this.id = id;
-// this.roleName = roleName;
-// this.roleCode = roleCode;
-// }
-//}
\ No newline at end of file
+class Test {
+ public static void main(String[] args) {
+ User u = new User(0, "zhangsan0", "zhangsanpwd0");
+ User u1 = new User(1, "zhangsan1", "zhangsanpwd");
+ User u2 = new User(2, "zhangsan2", "zhangsanpwd");
+ User u3 = new User(3, "zhangsan3", "zhangsanpwd");
+
+ Role r1 = new Role(1, "Admin", "Admin1");
+ Role r2 = new Role(2, "Admin", "Admin2");
+ Role r3 = new Role(3, "Admin", "Admin3");
+
+ DataAdapter ad = new DataAdapter(10086L, UUID.randomUUID().toString(), "sssfwef", u1);
+ u1.setRole(r1);
+
+ u2.getRoleList().add(r1);
+ u2.getRoleList().add(r2);
+ u2.getRoleList().add(r3);
+
+ u3.setRole(r1);
+ u3.getRoleList().add(r2);
+ u3.getRoleList().add(r3);
+
+ System.out.println(toXml(u) + "\n\n ");
+ System.out.println(toXml(u1) + "\n\n ");
+ System.out.println(toXml(u2) + "\n\n ");
+ System.out.println(toXml(u3) + "\n\n ");
+ System.out.println(toXml(ad) + "\n\n ");
+
+ System.out.println(JSON.toJSONString(toJavaBean(toXml(ad))));
+
+ }
+
+
+ @Data
+ @XStreamAlias("DataAdapter")
+ static
+//对应carInfos元素
+ class DataAdapter implements Serializable {
+
+ @XStreamAsAttribute
+ private Long scId;
+ private String key;
+ @XStreamCDATA
+ private String resultData;
+
+ private Object auth;
+
+ public DataAdapter(Long scId, String key, String resultData, Object auth) {
+ this.scId = scId;
+ this.key = key;
+ this.resultData = resultData;
+ this.auth = auth;
+ }
+ }
+
+ @Data
+ @XStreamAlias("user")
+ static
+//对应carInfos元素
+ class User implements Serializable {
+ private static final long serialVersionUID = -7554548655397869156L;
+
+ @XStreamAsAttribute
+ private Integer id;
+ private String loginName;
+ private String loginPwd;
+
+ private Role role;
+ private List roleList = new ArrayList();
+ private List roleArray;
+
+ public User() {
+ }
+
+ public User(Integer id, String loginName, String loginPwd) {
+ this.id = id;
+ this.loginName = loginName;
+ this.loginPwd = loginPwd;
+ }
+ }
+
+ @Data
+ @XStreamAlias("role")
+ static
+//对应carInfos元素
+ class Role implements Serializable {
+ private static final long serialVersionUID = -3134157833696958743L;
+ @XStreamAsAttribute
+ private Integer id;
+ private String roleName;
+ private String roleCode;
+
+ public Role() {
+ }
+
+ public Role(Integer id, String roleName, String roleCode) {
+ this.id = id;
+ this.roleName = roleName;
+ this.roleCode = roleCode;
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 88ac5be..23def74 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -1110,4 +1110,33 @@ public class ApsEnumUtil {
return description;
}
}
+
+ /**
+ * 订单状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum ORDER_STATUS {
+ NOPLAN("NOPLAN", "未计划"),
+ PLANDONE("PLANDONE", "计划完毕"),
+ INDICATIONDONE("INDICATIONDONE", "指示完毕"),
+ CONFIRM("CONFIRM", "确认"),
+ STARTPRODUCT("STARTPRODUCT", "开始生产"),
+ FINISH("FINISH", "完成");
+
+ private String value;
+ private String description;
+
+ ORDER_STATUS(String value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index 241e028..14ef7d8 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
@@ -1069,6 +1069,88 @@ public class BlockFormEnumUtil {
/**
+ * 元素编辑信息
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum PROPERTY_EDIT_STATUS {
+ ON(1, "ON", "开启"),
+ OFF(2, "OFF", "关闭"),
+ READONLY(3, "READONLY", "只读");
+
+ private int value;
+ private String code;
+ private String description;
+
+ private PROPERTY_EDIT_STATUS(int value, String code, String description) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfCode(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].code;
+ }
+ }
+ return tmp;
+ }
+
+ public static int codeOfValue(String code) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ 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;
+ }
+
+ public static PROPERTY_EDIT_STATUS valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ public static String codeOfDescription(String code) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
* 属性字段排序规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
index 0b8c98b..dd4bd75 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FTP_ENCODE {
- CONN_SUCCESS(10, "UTF-8", "UTF-8"),
- CONN_FAILURE(20, "GBK", "GBK");
+ UTF8(10, "UTF-8", "UTF-8"),
+ GBK(20, "GBK", "GBK"),
+ ISO88591(30, "ISO-8859-1", "ISO-8859-1");
private int value;
private String encode;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index 0574e44..64a9161 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -1234,4 +1234,47 @@ public class ImppEnumUtil {
return null;
}
}
+
+ /**
+ * 密码策略
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum CHECK_TEXT {
+ PASSWORD_VERIFY(1, "保存策略"),
+ PASSWORD_LOGIN(2, "登录策略");
+ private int value;
+ private String description;
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ private CHECK_TEXT(int value, String description) {
+ this.value = value;
+ this.description = 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 CHECK_TEXT valueOfEnum(int val) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
index e8c5618..84e7427 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
@@ -123,7 +123,7 @@ public class MdmEnumUtil {
public enum MDM_SYNC_TYPE{
INSERT(1, "新增"),
UPDATE(2, "修改"),
- DELETE(2, "删除");
+ DELETE(3, "删除");
private int value;
private String description;
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 b39e8ce..4eaace4 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
@@ -70,8 +70,9 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
- REVEAL_MODULE(10, "展示组件"),
- BUTTON_MODULE(30, "按钮组件");
+ REVEAL_MODULE(20, "展示组件"),
+ BUTTON_MODULE(30, "按钮组件"),
+ TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@@ -1143,6 +1144,16 @@ public class MesEnumUtil {
return tmp;
}
+ 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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
@@ -1903,7 +1914,13 @@ public class MesEnumUtil {
MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
- MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
+ MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"),
+ MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"),
+ NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"),
+ ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"),
+ SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
+ MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
+ MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系");
private int value;
private String service;
@@ -3246,7 +3263,8 @@ public class MesEnumUtil {
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
- REPAIR(70, "返修插单");
+ REPAIR(70, "返修插单"),
+ FICTIVE(80, "虚拟工单");
private int value;
private String description;
@@ -3273,6 +3291,16 @@ public class MesEnumUtil {
}
return tmp;
}
+
+ public static Integer descriptionOfValue(String description) {
+ Integer tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(description)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
}
/**
@@ -3482,6 +3510,7 @@ public class MesEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
+ REDO(60, "重做"),
CLOSE(90, "关闭"),
;
@@ -3632,7 +3661,8 @@ public class MesEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
- DISMANTLED(40, "已拆解");
+ DISMANTLED(40, "已拆解"),
+ PRE_CHECK(50, "待检测");
private int value;
private String description;
@@ -3829,7 +3859,8 @@ public class MesEnumUtil {
QUALIFIED(10, "number", "数字"),
DEFECTED(20, "text", "字符串"),
SCRAPED(30, "select", "可选值"),
- BUTTON(40, "button", "按钮");
+ BUTTON(40, "button", "按钮"),
+ WINDOW(50, "window", "开窗");
private int value;
private String code;
@@ -4893,7 +4924,8 @@ public class MesEnumUtil {
public enum PART_TRAIT {
NORMAL(10, "正常件"),
FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
- FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
+ FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
+ FICTIVE(40, "虚拟件");
private int value;
private String description;
@@ -5082,6 +5114,16 @@ public class MesEnumUtil {
}
return tmp;
}
+
+ public static Integer descriptionOfValue(String description) {
+ Integer tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(description)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
}
/**
@@ -5774,6 +5816,15 @@ public class MesEnumUtil {
}
return tmp;
}
+ public static String codeOfValue(String code) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
}
/**
@@ -6277,4 +6328,196 @@ public class MesEnumUtil {
return tmp;
}
}
+
+ /**
+ * 停机类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum STOP_MACHINE_TYPE {
+ TIMER_TIME_OUT(10, "计时器超时停机"),
+ DELAY_HELP(20, "延时帮助停机"),
+ URGENT_STOP(30, "急停停机");
+
+ private int value;
+ private String description;
+
+ STOP_MACHINE_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 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)
+ public enum OPTION_CODE {
+ EXISTENCE("+", "存在"),
+ NON_EXISTENCE("-", "不存在"),
+ BRACKET_OPERATION("()", "括号运算"),
+ AND("&", " 与"),
+ OR("|", "或");
+
+ private String value;
+ private String description;
+
+ OPTION_CODE(String value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(String value) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value.equals(value)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
+ * 条码生成模式
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum GENERATE_TYPE {
+ RELEASE_GENERATION(10, "下达生成"),
+ STATION_GENERATION(20, "工位生成");
+
+ private Integer value;
+ private String description;
+
+ GENERATE_TYPE(Integer value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(Integer value) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value.equals(value)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
+ * 客户JIT预装队列状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum QUEUE_JIT_PLAN_STATUS {
+ CREATE(10, "创建"),
+ RELEASED(20, "已释放"),
+ ERROR(999, "异常");
+
+ private Integer value;
+ private String description;
+
+ QUEUE_JIT_PLAN_STATUS(Integer value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(Integer value) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value.equals(value)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
+ * 客户JIT预装队列 工单类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
+ SPARE_PART_PRODUCTION(10, "备件生产"),
+ REPRODUCTION_RMS(20, "重新生产-报功"),
+ REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
+
+ private Integer value;
+ private String description;
+
+ QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public Integer getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(Integer value) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value.equals(value)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 9493cae..358e5d0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -18,8 +18,9 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
- REVEAL_MODULE(10, "展示组件"),
- BUTTON_MODULE(30, "按钮组件");
+ REVEAL_MODULE(20, "展示组件"),
+ BUTTON_MODULE(30, "按钮组件"),
+ TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@@ -716,7 +717,8 @@ public class MesPcnEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
- DISMANTLED(40, "已拆解");
+ DISMANTLED(40, "已拆解"),
+ PRE_CHECK(50, "待检测");
private int value;
private String description;
@@ -2023,7 +2025,8 @@ public class MesPcnEnumUtil {
NORMAL(10, "正常"),
CLOSE(20, "关闭"),
- FINISH(30, "完成");
+ FINISH(30, "完成"),
+ OFF_LINE_REWORK(40, "线下返修");
private int value;
private String description;
@@ -2376,6 +2379,7 @@ public class MesPcnEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPPING(50, "发运"),
+ REDO(60, "重做"),
CLOSE(90, "关闭");
private int value;
@@ -2403,6 +2407,16 @@ public class MesPcnEnumUtil {
}
return tmp;
}
+
+ 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;
+ }
}
@@ -2476,7 +2490,7 @@ public class MesPcnEnumUtil {
public enum PACKAGE_PRINT_STATUS {
UNPRINTED(10, "未打印"),
- PRINTED(20, "打印");
+ PRINTED(20, "已打印");
private int value;
private String description;
@@ -3398,6 +3412,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FSM_STATE_TYPE {
BEGIN(10, "begin", "开始状态点"),
+ BACK(20, "back", "回退状态点"),
END(40, "end", "结束状态点");
private int value;
@@ -3600,7 +3615,8 @@ public class MesPcnEnumUtil {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
- FINISH(40, "FINISH", "完成状态");
+ FINISH(40, "FINISH", "完成状态"),
+ BACK(99, "BACK", "回退状态");
private int value;
private String code;
@@ -4114,4 +4130,199 @@ public class MesPcnEnumUtil {
return tmp;
}
}
+
+ /**
+ * plc状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum MES_PLC_STATUS {
+
+ UN_CONNECT(0, "断开"),
+ CONNECT(1, "连接");
+
+ private int value;
+ private String description;
+
+ MES_PLC_STATUS(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 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)
+ public enum MES_OPTION_TYPE {
+
+ OPTION_PART(1, "选配件"),
+ BOM_DISASSEMBLY(2, "BOM拆解");
+
+ private int value;
+ private String description;
+
+ MES_OPTION_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;
+ }
+
+ public static Integer descriptionOfValue(String description) {
+ Integer tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(description)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
+ * 绑定模式
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum KEY_BIND_MODE {
+
+ PRODUCE_BOM_BIND(10, "产品BOM绑定"),
+ SCATTER_BOM_BIND(20, "散件BOM绑定");
+
+ private int value;
+ private String description;
+
+ KEY_BIND_MODE(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;
+ }
+
+ public static Integer descriptionOfValue(String description) {
+ Integer tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(description)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
+ * 不良品处理类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum BAD_HANDLE_TYPE {
+ BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
+ SCRAPPED(20, "SCRAPPED", "报废"),
+ POLISHING(30, "POLISHING", "抛光"),
+ DETERMIND(40, "DETERMIND", "待定");
+
+ private int value;
+ private String code;
+ private String description;
+
+ BAD_HANDLE_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;
+ }
+
+ public static String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
index 3d1fc0d..d29b37b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
@@ -1281,7 +1281,7 @@ public class PtlPcnEnumUtil {
}
/**
- * mes-pcn定时任务同步结果状态
+ * ptl-pcn定时任务同步结果状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PCN_TASK_SYNC_STATUS {
@@ -1583,4 +1583,40 @@ public class PtlPcnEnumUtil {
return tmp;
}
}
+
+ /**
+ * 同步标识
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum SYNC_FLAG {
+
+ UNSYNC(1, "未同步"),
+ SYNCED(2, "已同步");
+
+ private int value;
+ private String description;
+
+ SYNC_FLAG(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;
+ }
+ }
}
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 077e388..d298220 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
@@ -514,7 +514,8 @@ public class WmsEnumUtil {
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库"),
TRANSIT_LOCATE(80, "T", "在途库"),
- UTENSIL_LOCATE(90, "U", "器具库");
+ UTENSIL_LOCATE(90, "U", "器具库"),
+ OPERATION_PALTFORM(100, "W", "工作台");
private int value;
private String code;
@@ -726,7 +727,12 @@ public class WmsEnumUtil {
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
- SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
+ SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"),
+ FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"),
+ CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
+ CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
+ AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
+ FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
private int value;
private String code;
private String description;
@@ -769,6 +775,19 @@ public class WmsEnumUtil {
return tmp;
}
+ public static OUT_MOVEMENT_BUSI_TYPE codeOfs(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@@ -921,7 +940,8 @@ public class WmsEnumUtil {
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"),
- TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料");
+ TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"),
+ INTELLIGENT("INTELLIGENT", "智能化");
private String value;
private String description;
@@ -1347,7 +1367,8 @@ public class WmsEnumUtil {
PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存"),
- MATERIAL_COVERAGE(140, "物料覆盖");
+ MATERIAL_COVERAGE(140, "物料覆盖"),
+ CHECK(150, "点检");
private int value;
private String description;
@@ -3361,6 +3382,7 @@ public class WmsEnumUtil {
public enum SRC_STATUS {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
+ TGMES("TGMES", "泰国MES"),
AMP("AMP", "AMP系统"),
DR("DR", "直送拉动");
@@ -3379,6 +3401,16 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
+
+ public static String descriptionOfValue(String value) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value.equals(value)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
}
public static Map getEnumByName(String enumName) throws Exception {
@@ -4133,7 +4165,8 @@ public class WmsEnumUtil {
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"),
CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"),
- UPDATE_TASK(60, "UPDATE_TASK", "复用任务");
+ UPDATE_TASK(60, "UPDATE_TASK", "复用任务"),
+ AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单");
private int value;
private String code;
private String description;
@@ -7550,16 +7583,16 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
- ASN(10, "wmsDoMovementMasterRepository", "ASN"),
- PO(20, "wmsDoMovementMasterRepository", "PO"),
- SO(30, "wmsDoMovementMasterRepository", "SO"),
- MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
- IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
- SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
- QC(70, "wmsDoMovementMasterRepository", "质检单"),
+ ASN(10, "wmsDocMovementMasterRepository", "ASN"),
+ PO(20, "wmsDocMovementMasterRepository", "PO"),
+ SO(30, "wmsDocMovementMasterRepository", "SO"),
+ MOVE(40, "wmsDocMovementMasterRepository", "移库单"),
+ IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"),
+ SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"),
+ QC(70, "wmsQCMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
- PO_SN(100, "wmsPoSnRepository", "收货条码");
+ PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码");
private int value;
private String code;
@@ -7635,4 +7668,790 @@ public class WmsEnumUtil {
return null;
}
}
+
+ /**
+ * 策略等级
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum TRACTICS_GRADE {
+ ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"),
+ TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"),
+ THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略");
+
+ private int value;
+ private String code;
+ private String description;
+
+ TRACTICS_GRADE(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static TRACTICS_GRADE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 策略组
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum TRACTICS_GROUP {
+ INSTOCK(10, "INSTOCK", "上架"),
+ PICKING(20, "PICKING", "拣货");
+
+ private int value;
+ private String code;
+ private String description;
+
+ TRACTICS_GROUP(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static TRACTICS_GROUP codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 上架:策略项:1级策略
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum INSTOCK_TRACTICS_ITEM_ONE {
+ COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"),
+ ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"),
+ AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"),
+ INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"),
+ ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定");
+
+ private int value;
+ private String code;
+ private String description;
+
+ INSTOCK_TRACTICS_ITEM_ONE(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static INSTOCK_TRACTICS_ITEM_ONE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 上架:策略项:2级策略
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum INSTOCK_TRACTICS_ITEM_TWO {
+ FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"),
+ EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐");
+
+ private int value;
+ private String code;
+ private String description;
+
+ INSTOCK_TRACTICS_ITEM_TWO(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static INSTOCK_TRACTICS_ITEM_TWO codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 上架:策略项:3级策略
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum INSTOCK_TRACTICS_ITEM_THREE {
+ FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"),
+ EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"),
+ WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐");
+
+ private int value;
+ private String code;
+ private String description;
+
+ INSTOCK_TRACTICS_ITEM_THREE(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static INSTOCK_TRACTICS_ITEM_THREE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 拣货:策略项:1级策略
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum PICKING_TRACTICS_ITEM_ONE {
+ ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"),
+ RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"),
+ LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序");
+
+ private int value;
+ private String code;
+ private String description;
+
+ PICKING_TRACTICS_ITEM_ONE(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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static PICKING_TRACTICS_ITEM_ONE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 库位坐标是否允许偏移
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum DOWN_OR_UP {
+
+ IS_TRUE(10, "IS_TRUE", "允许"),
+ IS_FALSE(20, "IS_FALSE", "不允许");
+
+ private int value;
+ private String codeValue;
+ private String description;
+
+ DOWN_OR_UP(int value, String codeValue, String description) {
+ this.value = value;
+ this.codeValue = codeValue;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getCodeValue() {
+ return codeValue;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+ }
+
+ /**
+ * 动作类型
+ * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、
+ * 80-取消任务、90-递进交换
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum STRATEGY_ACTION_TYPE {
+ LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"),
+ LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"),
+ LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"),
+ UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"),
+ UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"),
+ UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
+ GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
+ CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
+ PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换");
+
+ private int value;
+ private String code;
+ private String description;
+
+ STRATEGY_ACTION_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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static STRATEGY_ACTION_TYPE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ /**
+ * 自动化策略 数量控制
+ * 默认为 10
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum AUTO_STRATEGY_QTY_CONTROL {
+ LESS_SEND(10, "少发"),
+ MANY_SEND(20, "多发"),
+ CONSISTENT(30, "一致");
+
+ private int value;
+ private String description;
+
+ AUTO_STRATEGY_QTY_CONTROL(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ 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;
+ }
+ }
+
+
+ /**
+ * 自动入库任务
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum AUTO_FORK_TASK_TYPE {
+ START(10, "start", "start"),
+ END(20, "end", "end");
+
+ private int value;
+ private String code;
+ private String description;
+
+ AUTO_FORK_TASK_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;
+ }
+
+ public static String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+ }
+
+
+ /**
+ * AUTO 命令状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum AUTO_FORK_TASK_STATUS {
+ CREATE(10, "新建"),
+ PROCESSING(20, "处理中"),
+ COMPLETE(30, "已完成"),
+ ERROR(40, "处理异常");
+
+ private int value;
+ private String description;
+
+ AUTO_FORK_TASK_STATUS(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static AUTO_FORK_TASK_STATUS codeOf(int value) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ 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;
+ }
+ }
+
+ /**
+ * 自动化日志记录-操作类型
+ * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它
+ *
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum OPERATE_TYPE {
+ ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"),
+ STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"),
+ TASK_GENERATE(30, "TASK_GENERATE", "任务生成"),
+ START(40, "START", "START"),
+ END(50, "END", "END"),
+ OTHER(60, "OTHER", "其它");
+
+ private int value;
+ private String code;
+ private String description;
+
+ OPERATE_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 String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ 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;
+ }
+
+ public static OPERATE_TYPE codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index c0874d6..afd81eb 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -392,7 +392,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List listPager(Pager pager) {
- if (pager.getTotalRows() > 0) {
+ if (pager != null) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@@ -649,7 +649,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(propertyName, value)
@@ -661,7 +661,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@@ -792,7 +792,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@@ -827,7 +827,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Deprecated
@Override
public List findByHqlWherePage(String hqlWhere, Pager pager) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@@ -846,7 +846,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlWherePage(DdlPackBean packBean, Pager pager) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@@ -924,7 +924,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlPage(String hqlWhere, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@@ -943,7 +943,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlPage(DdlPackBean packBean, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@@ -961,7 +961,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@@ -989,7 +989,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findBySqlPage(String sql, Pager pager) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@@ -1001,7 +1001,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findBySqlPage(String sql, Class entity, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
return entityManager.createNativeQuery(sql,entity)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@@ -1114,7 +1114,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append(hql + " as model where 1=1 ");
@@ -1153,7 +1153,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlPageObjects(String hql, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList();
@@ -1162,7 +1162,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
- if(pager.getTotalRows() > 0) {
+ if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@@ -1183,7 +1183,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep
@Override
public List findBySqlObjListByPager(String sql, Pager pager) {
- if(pager.getTotalRows() > 0){
+ if(pager != null){
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index f714b7d..b599490 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
index 9f2b83c..8085d44 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
/**
* @Description :
@@ -108,4 +110,8 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="关联对象元素属性Code")
private String secElementPropertyCodeRdd;
+
+ @Transient
+ @ApiParam(value ="表单功能明细关联属性")
+ private List refList;
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java
new file mode 100644
index 0000000..0a5e8be
--- /dev/null
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.form.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : yunhao
+ * @CreateDate : 2019-03-21 21:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="BF_METHOD_DETAIL_PROPERTY")
+@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
+public class BfMethodDetailPropertyRef extends BaseBean {
+
+ private static final long serialVersionUID = -7541677357317732343L;
+ @Column(name="DETAIL_PROPERTY_ID")
+ @ApiParam(value ="功能明细关联属性id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long detailPropertyId;
+
+ @Column(name="PRI_ELEMENT_PROPERTY_ID")
+ @ApiParam(value ="主对象元素属性id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long priElementPropertyId;
+
+ @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
+ @ApiParam(value ="主对象元素属性名称")
+ private String priElementPropertyNameRdd;
+
+ @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
+ @ApiParam(value ="主对象元素属性code")
+ private String priElementPropertyCodeRdd;
+
+ @Column(name="SEC_ELEMENT_PROPERTY_ID")
+ @ApiParam(value ="关联对象元素属性id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long secElementPropertyId;
+
+ @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
+ @ApiParam(value ="关联对象元素属性名称")
+ private String secElementPropertyNameRdd;
+
+ @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
+ @ApiParam(value ="关联对象元素属性Code")
+ private String secElementPropertyCodeRdd;
+}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java
deleted file mode 100644
index b3de0fb..0000000
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-//package cn.estsh.i3plus.pojo.form.repository;
-//
-//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
-//
-///**
-// * @Description : 元素约束属性
-// * @Reference :
-// * @Author : yunhao
-// * @CreateDate : 2019-03-21 20:27
-// * @Modify:
-// **/
-//public interface BfElementConstraintPropertyRepository extends BaseRepository {
-//}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java
new file mode 100644
index 0000000..122ba80
--- /dev/null
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.form.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-06-16 16:56
+ * @Modify:
+ **/
+public interface BfMethodDetailPropertyRefRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
index c220ed2..d913912 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@@ -394,7 +394,6 @@ public final class FormHqlPack {
return ddlPackBean;
}
-
/**
* 数据对象查询条件拼接
* @param bfCascade
@@ -409,4 +408,17 @@ public final class FormHqlPack {
return ddlPackBean;
}
+ /**
+ * 数据对象查询条件拼接
+ * @param bfMethodDetailPropertyRef
+ * @return
+ */
+ public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){
+ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef);
+
+ DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean);
+
+ return ddlPackBean;
+ }
+
}
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index b7991cc..aca1465 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 0648e9f..ae38208 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index f10cf39..a6a0d68 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 3b9e57a..04b40d4 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index b1911ec..6854e65 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
index 859a6b3..3fef7c4 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
@@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
@Transient
@ApiModelProperty("是否主数据")
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiModelProperty("mdm数据版本")
@JsonSerialize(using = ToStringSerializer.class)
+ @AnnoOutputColumn(hidden = true)
private Long mdmVersion;
public long getMdmVersionVal() {
@@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
@Column(name = "IS_MDM_PUBLISHED")
@ApiModelProperty("是否发布")
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
private Integer isMdmPublished;
@Column(name = "MDM_OPERATE_TYPE")
@ApiModelProperty("操作类型")
- @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
+ @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
private Integer mdmOperateType;
public Integer getMdmOperateTypeVal() {
return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
}
+ public String getMdmOperateTypeTxt(){
+ return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
+ }
+
@Column(name = "MDM_REF_ID")
@ApiModelProperty("关联id")
@JsonSerialize(using = ToStringSerializer.class)
+ @AnnoOutputColumn(hidden = true)
private Long mdmRefId;
//排序方式
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
index 96d8c16..ef84a68 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
@@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
@Transient
@ApiModelProperty("是否主数据")
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiModelProperty("主数据Class")
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
- public static Class mdmMasterClass = BaseMdmBean.class;
+ @AnnoOutputColumn(hidden = true)
+ protected static Class mdmMasterClass = BaseMdmBean.class;
@Transient
@ApiModelProperty("软件模块")
- @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
- public static Integer mdmSoftType;
+ @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
+ protected static Integer mdmSoftType;
@Column(name = "MDM_MASTER_ID")
@ApiModelProperty("主数据id")
@JsonSerialize(using = ToStringSerializer.class)
- private Long mdmMasterId;
+ public Long mdmMasterId;
}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
index 3aafc4b..1fe17c1 100644
--- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
@@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
**/
public abstract class BaseMdmBusiModelBean {
+ public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
+ this.mdmMasterBean = mdmMasterBean;
+ this.mdmBusiBean = mdmBusiBean;
+ }
+
@ApiModelProperty("主数据")
private M mdmMasterBean;
@@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 830caa5..bbe0ff9 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java
new file mode 100644
index 0000000..d95ebc1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java
@@ -0,0 +1,90 @@
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :不良信息接口表
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-28
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_DEFECT_DATA")
+@Api("不良信息接口数据")
+public class IfDefectData extends BaseBean implements Serializable {
+ private static final long serialVersionUID = 4320604250440221049L;
+ @Column(name = "SERIAL_NUMBER")
+ @ApiParam("产品条码")
+ private String serailNumber;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料号")
+ private String partNo;
+
+ @Column(name = "PART_NAME")
+ @ApiParam("物料名称")
+ private String partName;
+
+ @Column(name = "DEFECT_CODE")
+ @ApiParam("缺陷代码")
+ private String defectCode;
+
+ @Column(name = "DEFECT_NAME")
+ @ApiParam("缺陷名称")
+ private String defectName;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
+ @Column(name = "WORK_CELL_CODE")
+ @ApiParam("工作单元代码")
+ private String workCellCode;
+
+ @Column(name = "MEMO")
+ @ApiParam("备注")
+ private String memo;
+
+ @Column(name = "DEFECT_ACTION_TYPE")
+ @ApiParam("不良处理类型")
+ private Integer defectActionType;
+
+ @Column(name = "QTY")
+ @ApiParam("数量")
+ private Double qty;
+
+ @Column(name = "SYNC_STATUS")
+ @ApiParam("同步状态")
+ private Integer syncStatus;
+
+ @Lob
+ @Column(name = "ERROR_MESSAGE")
+ @ApiParam("异常消息")
+ private String errorMessage;
+
+ @Column(name = "ACTION_TYPE")
+ @ApiParam("动作代码")
+ private String actionType;
+
+ @Column(name = "IF_CODE")
+ @ApiParam("接口代码")
+ private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java
new file mode 100644
index 0000000..a41617f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_EDI_INITIAL_DATA")
+@Api("EDI_初始数据表")
+public class IfEdiInitialData extends BaseBean implements Serializable {
+ private static final long serialVersionUID = -523843818485699827L;
+
+ @Column(name = "PROGRAM_DATA")
+ @ApiParam("EDI抓取程序代码")
+ private String programData;
+
+ @Column(name = "CONTENT")
+ @ApiParam("数据")
+ private String content;
+
+ @Column(name = "FILE_NAME")
+ @ApiParam("文件名称")
+ private String fileName;
+
+ @Lob
+ @Column(name = "FILE_URL")
+ @ApiParam("文件URL")
+ private String fileUrl;
+
+ @Column(name = "SYNC_STATUS")
+ @ApiParam("同步状态")
+ private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
index 2708fcf..280de6b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
@@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable {
private String partName;
@Column(name = "SERIAL_NUMBER")
- @ApiParam("产品条码")
+ @ApiParam("过程条码")
private String serialNumber;
+ @Column(name = "PRODUCT_SN")
+ @ApiParam("产品条码")
+ private String productSn;
+
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@@ -107,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String custDeliveryLocation;
+
+ @Column(name = "CUSTOMER_CODE")
+ @ApiParam("客户代码")
+ private String customerCode;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index fb6c793..2be9e5b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -123,4 +123,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
+
+ @Column(name = "CT_NO")
+ @ApiParam("容器编号")
+ private String ctNo;
+
+ @Column(name = "CUSTOMER_CODE")
+ @ApiParam("客户代码")
+ private String customerCode;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index a4ba000..3088e6b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("产品位置")
private String produceCategoryCode;
-
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料号")
private String itemPartNo;
+ @Column(name = "CUST_PART_NO")
+ @ApiParam("客户物料号")
+ private String custPartNo;
+
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料用量")
private String itemUnit;
+ @Column(name = "JIT_SEQ")
+ @ApiParam("jit排序号")
+ private Double jitSeq;
+
+ @Column(name = "JIT_TYPE_FLAG")
+ @ApiParam("JIT类型标识")
+ private String jitTypeFlag;
+
+ @Column(name = "CUST_POINT_DATE")
+ @ApiParam("客户需求时间")
+ private String custPointDate;
+
+ @Column(name = "CUST_PLANT_CODE")
+ @ApiParam("客户工厂代码")
+ private String custPlantCode;
+
+ @Column(name = "DOCK_NO")
+ @ApiParam("道口")
+ private String dockNo;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
index 41042ca..109521f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.io.Serializable;
/**
@@ -66,6 +67,13 @@ public class MesCellFeed extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
+ @Transient
+ @ApiParam("工单号")
+ private String orderNo;
+
+ @Transient
+ @ApiParam(value = "原料类型名称")
+ private String rawTypeName;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
index 9386832..aa1dc88 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
@@ -30,6 +30,11 @@ import java.io.Serializable;
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;
+
+ @Column(name = "ORDER_NO")
+ @ApiParam("工单号")
+ private String orderNo;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@@ -66,7 +71,6 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
-
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java
index a943c4a..83396d1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java
@@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
@Column(name = "CUSTOMER_PART_NAME")
@ApiParam("客户零件描述")
private String customerPartName;
+
+ @Column(name = "CUSTOMER_CFG_CODE")
+ @ApiParam("客戶配置代碼")
+ private String customerCfgCode;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
index cb0f1b4..a4a2dca 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
@@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("项目代码")
private String prodCfgTypeCode;
+ @Column(name = "DEFECT_FLAG_VALUE")
+ @ApiParam("缺陷标识值")
+ private String defectFlagValue;
+
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
index a3a2cdb..fbd81ad 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
-import java.util.Date;
import java.util.List;
/**
@@ -81,14 +80,17 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("备注")
private String memo;
-// @Column(name = "WORK_ORDER_NO")
-// @ApiParam("工单号")
-// private String workOrderNo;
-
+ @Column(name = "DEFECT_ACTION_TYPE")
+ @ApiParam("不良处理类型")
+ private Integer defectActionType;
@Transient
private List mesDefectList;
+ @Transient
+ @ApiParam("后移数量")
+ private Integer backwardNum;
+
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java
new file mode 100644
index 0000000..5e4db8a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java
@@ -0,0 +1,52 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/27 21:39
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EDI_PARSER_CONFIG")
+@Api("EDI解析配置表")
+public class MesEdiParserConfig extends BaseBean implements Serializable {
+ private static final long serialVersionUID = 7225381299744633270L;
+
+ @Column(name = "PARSER_CODE")
+ @ApiParam("解析配置代码")
+ private String parserCode;
+
+ @Column(name = "PARSER_NAME")
+ @ApiParam("解析配置名称")
+ private String parserName;
+
+ @Column(name = "PARSER_TYPE")
+ @ApiParam("解析程序集")
+ private String parserType;
+
+ @Column(name = "GETTING_CODE")
+ @ApiParam("edi抓取程序代码")
+ private String gettingCode;
+
+ @Column(name = "CURRENT_ORDER")
+ @ApiParam("当前订单号")
+ private String currentOrder;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
new file mode 100644
index 0000000..33b0024
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
+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 java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\5 10:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EXTEND_OBJECT_CFG")
+@Api("扩展对象结构")
+public class MesExtendObjectCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -6773040095905972250L;
+
+ @Column(name = "OBJECT_CODE")
+ @ApiParam("对象代码")
+ private String objectCode;
+
+ @Column(name = "FIELD_CODE")
+ @ApiParam("扩展字段代码")
+ private String fieldCode;
+
+ @Column(name = "FIELD_NAME")
+ @ApiParam("扩展字段名称")
+ private String fieldName;
+
+ @Column(name = "FIELD_TYPE")
+ @ApiParam("扩展字段类型")
+ @AnnoOutputColumn(refClass = MesEnumUtil.DATA_FORMAT.class, refForeignKey = "value", value = "description")
+ private Integer fieldType;
+
+ @Column(name = "FIELD_LENGTH")
+ @ApiParam("扩展字段长度")
+ private String fieldLength;
+
+ @Column(name = "DEFAULT_VALUE")
+ @ApiParam("默认值")
+ private String defaultValue;
+
+ @Column(name = "FIELD_DESC")
+ @ApiParam("扩展字段描述")
+ private String fieldDesc;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
index 5dd8c97..752cdd2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
@@ -55,6 +55,10 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("数据下限")
private Double lowerLimit;
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java
new file mode 100644
index 0000000..34186bd
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java
@@ -0,0 +1,41 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_模具_零件对照表
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_MOULD_PART")
+@Api("MES_模具_零件对照表")
+public class MesMouldPart extends BaseBean implements Serializable {
+ private static final long serialVersionUID = -773118210589936438L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("零件号")
+ private String partNo;
+
+ @Column(name = "MOULD_CODE")
+ @ApiParam("模具代码")
+ private String mouldCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
index 1880189..dac14a4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
@@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable {
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
- private Double qty;
+ private Double qty = 0d;
@Column(name = "QTY2")
@ColumnDefault("0")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index 4b81afd..a46c53d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -118,6 +118,16 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("客户发往地")
private String custDeliveryLocation;
+ // 赋值模板代码
+ @Column(name = "PACKAGE_LABEL_TEMPLATE")
+ @ApiParam("包装标签模板")
+ private String packageLabelTemplate;
+
+ // 二维码
+ @Column(name = "QR_CODE")
+ @ApiParam("包装二维码")
+ private String qrCode;
+
public MesPackage() {
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index b65531b..817a07c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("零件规格")
private String partSpec;
+ @Column(name = "PART_SPEC_QTY")
+ @ApiParam("标准包规数量")
+ private Double partSpecQty;
+
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@@ -96,6 +100,26 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("物料特性")
private Integer partTrait;
+ @Column(name = "COLOR_CODE")
+ @ApiParam("颜色代码")
+ private String colorCode;
+
+ @Column(name = "SHELVES_AMOUNT")
+ @ApiParam("挂架数")
+ private Integer shelvesAmount;
+
+ @Column(name = "QUANTITY_PER_RACK")
+ @ApiParam("挂架可放零件数")
+ private Integer quantityPerRack;
+
+ @Column(name = "PAINT_TANK_CODE")
+ @ApiParam("供漆罐代码")
+ private String paintTankCode;
+
+ @Column(name = "PRE_PART_NO")
+ @ApiParam("打磨件物料号")
+ private String prePartNo;
+
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
index 7fbe7f7..8cbe1c3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.io.Serializable;
/**
@@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable {
@ApiParam("校验表达式描述")
private String recordNumDesc;
+ @Transient
+ @ApiParam("复核结果")
+ private Integer reviewResult = 1;
+
+ @Transient
+ @ApiParam("对象名称")
+ private String objectCodeName;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("产线")
+ private String workCenterCode;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
index 63b5871..87bcffe 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
@@ -38,6 +38,14 @@ public class MesPartFormula extends BaseBean implements Serializable {
@ApiParam("配方内容")
private String formulaContent;
+ @Column(name = "FORMULA_DESC")
+ @ApiParam("配方描述")
+ private String formulaDesc;
+
+ @Column(name = "QTY")
+ @ApiParam("配方零件总数")
+ private Integer qty;
+
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java
new file mode 100644
index 0000000..c5c1b75
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java
@@ -0,0 +1,37 @@
+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;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_PART_PROD_CFG_TYPE")
+@EqualsAndHashCode(callSuper = true)
+@Api("MES_物料项目关系")
+public class MesPartProdCfgType extends BaseBean implements Serializable {
+ private static final long serialVersionUID = -640972198237355570L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料号")
+ private String partNo;
+
+ @Column(name = "CUST_CODE")
+ @ApiParam("客户代码")
+ private String custCode;
+
+ @Column(name = "PROD_CFG_TYPE_CODE")
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java
new file mode 100644
index 0000000..c738fc7
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java
@@ -0,0 +1,50 @@
+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;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description :MES_生产节拍
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PLAN_TAKT")
+@Api("MES_生产节拍")
+public class MesPartTakt extends BaseBean implements Serializable {
+ private static final long serialVersionUID = -7731182105899332278L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("零件号")
+ private String partNo;
+
+ @Column(name = "PART_NAME")
+ @ApiParam("零件名称")
+ private String partName;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心")
+ private String workCenterCode;
+
+ @Column(name = "PLAN_TAKT")
+ @ApiParam("节拍")
+ private Integer planTakt;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
index 83f9049..f22f371 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
index b3e82e2..66ba978 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@@ -112,7 +112,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam("产品条码零件名称")
private String partName;
- @Transient
+ @Column(name = "ITEM_PART_NAME")
@ApiParam("原材料零件名称")
private String itemPartName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
new file mode 100644
index 0000000..c4eae0c
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
@@ -0,0 +1,50 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :产品工作中心配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_WORK_CENTER")
+@Api("产品工作中心配置")
+public class MesProdWorkCenter extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 9215737252535074536L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料编码")
+ private String partNo;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
+ @Column(name = "IS_DEFAULT")
+ @ApiParam("是否默认")
+ private Integer isDefault;
+
+ @Column(name = "PART_SN")
+ @ApiParam("料箱条码")
+ private String partSn;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java
index fdf53da..853652c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CATEGORY")
-@Api("系统业务动作")
+@Api("MES_产品位置")
public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = -992595557921651448L;
@@ -37,4 +37,8 @@ public class MesProduceCategory extends BaseBean implements Serializable {
@Column(name = "PRODUCE_CTGY_NAME")
@ApiParam("产品类型名称")
private String produceCategoryName;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index bc568d7..7fead57 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -140,6 +140,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
+ @Column(name = "CUST_LABEL_TEMPLATE")
+ @ApiParam("客户标签模板")
+ private String custLabelTemplate;
+
+ @Column(name = "LOT_NO")
+ @ApiParam("生产批次")
+ private String lotNo;
+
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
@@ -173,7 +181,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码类型名称")
private String snTypeName;
+ @Transient
+ @ApiParam("条码打印状态名称")
+ private String printStatusName;
+ @Version
+ @Column(name = "LOCK_VERSION")
+ @ApiParam(value = "乐观锁", example = "1")
+ public Integer lockVersion;
public MesProduceSn() {
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index b4d21c1..30cffcc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -118,6 +118,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("客户产线代码")
private String custProdLineCode;
+ @Column(name = "PROD_CFG_TYPE_CODE")
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+
+ @Column(name = "IS_LOCK")
+ @ApiParam("锁定标识")
+ private Integer isLock;
+
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
index b6663bd..cde084a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
@@ -56,6 +56,10 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@ApiParam("用量")
private Double qty = 0d;
+ @Column(name = "DOCK_NO")
+ @ApiParam("道口")
+ private String dockNo;
+
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index 133b159..9fc4b52 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -89,6 +89,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("选项代码")
private String optionCode;
+ @Column(name = "FORMULA_CONTENT")
+ @ApiParam("配方内容")
+ private String formulaContent;
+
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
index d982dab..b55af50 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
@@ -10,7 +10,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Lob;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.io.Serializable;
/**
@@ -53,7 +55,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "SEQ")
@ApiParam("计划排序号")
- private String seq;
+ private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
@@ -74,4 +76,44 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "VERSION")
@ApiParam("版本号")
private String version;
+
+ @Column(name = "JIT_SEQ")
+ @ApiParam("JIT排序号")
+ private String jitSeq;
+
+ @Column(name = "PROD_CFG_TYPE_CODE")
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+
+ @Column(name = "MEMO")
+ @ApiParam("备注")
+ private String memo;
+
+ @Column(name = "SUPPLIER_CODE")
+ @ApiParam("供应商编号")
+ private String supplierCode;
+
+ @Column(name = "SUPPLIER_NAME")
+ @ApiParam("供应商名称")
+ private String supplierName;
+
+ @Column(name = "FILE_NAME")
+ @ApiParam("解析文件名")
+ private String fileName;
+
+ @Column(name = "FILE_URL")
+ @ApiParam("解析文件路径")
+ private String fileUrl;
+
+ @Column(name = "WORK_ORDER_TYPE")
+ @ApiParam("工单类型")
+ private Integer workOrderType;
+
+ @Transient
+ @ApiParam("计划上线开始时间")
+ private String planStartDate;
+
+ @Transient
+ @ApiParam("计划上线结束时间")
+ private String planEndDate;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
index 1d9faad..5177ba9 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
@@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable {
@ApiParam("队列编号")
private String jisPlanNo;
+ @Column(name = "PRODUCE_CTGY_CODE")
+ @ApiParam("产品位置代码")
+ private String produceCtgyCode;
+
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
- @Column(name = "ITEM_PART_NO")
- @ApiParam("原材料物料号")
- private String itemPartNo;
+ @Column(name = "CUST_PART_NO")
+ @ApiParam("客户物料号")
+ private String custPartNo;
@Column(name = "DOCK_NO")
@ApiParam("道口")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
index 7111b75..d290454 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
@@ -44,6 +44,18 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
private String partNo;
@Column(name = "PART_NAME")
- @ApiParam("产品名称")
+ @ApiParam("物料名称")
private String partName;
+
+ @Column(name = "PRODUCE_CTGY_CODE")
+ @ApiParam("产品位置代码")
+ private String produceCtgyCode;
+
+ @Column(name = "CUST_PART_NO")
+ @ApiParam("客户物料号")
+ private String custPartNo;
+
+ @Column(name = "FORMULA_CONTENT")
+ @ApiParam("配方内容")
+ private String formulaContent;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index fa22aa7..5aba4be 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
- @ApiParam("产品类型代码")
+ @ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
- @ApiParam("产品类型名称")
+ @ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("组件编号")
private String assyNo;
+ @Column(name = "FORMULA_CONTENT")
+ @ApiParam("配方内容")
+ private String formulaContent;
+
@Transient
@ApiParam("队列序号")
private Double queueSeq;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
new file mode 100644
index 0000000..7642f27
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
@@ -0,0 +1,88 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @author adair.song
+ * @date 2020/06/17 13:12
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "MES_SCATTER_BOM_CFG")
+@EqualsAndHashCode(callSuper = true)
+@Api("MES_散件BOM配置")
+public class MesScatterBomCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 521506217898252289L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料号")
+ private String partNo;
+
+ @Column(name = "CUSTOMER_PART_NO")
+ @ApiParam("客户零件号")
+ private String customerPartNo;
+
+ @Column(name = "PART_LOCATION1")
+ @ApiParam("产品位置1")
+ private String partLocation1;
+
+ @Column(name = "PART_LOCATION2")
+ @ApiParam("产品位置2")
+ private String partLocation2;
+
+ @Column(name = "PART_LOCATION3")
+ @ApiParam("产品位置3")
+ private String partLocation3;
+
+ @Column(name = "PART_LOCATION4")
+ @ApiParam("产品位置4")
+ private String partLocation4;
+
+ @Column(name = "WORK_CELL_CODE")
+ @ApiParam("工作单元代码")
+ private String workCellCode;
+
+ @Column(name = "CATEGORY_CODE2")
+ @ApiParam("类型2")
+ private String categoryCode2;
+
+ @Column(name = "CATEGORY_CODE3")
+ @ApiParam("类型3")
+ private String categoryCode3;
+
+ @Column(name = "IS_BIND_KEY")
+ @ApiParam("是否关键件")
+ private Integer isBindKey = 1;
+
+ @Column(name = "CHECK_GROUP")
+ @ApiParam("校验分组号")
+ private String checkGroup;
+
+ @Column(name = "OPTION_CODE")
+ @ApiParam("选项代码")
+ private String optionCode;
+
+ @Column(name = "RECIPE_ITEM")
+ @ApiParam("配方项")
+ private String recipeItem;
+
+ @Column(name = "RECIPE_SEQ")
+ @ApiParam("配方序号")
+ private String recipeSeq;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
index 4b8994b..5bc6718 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
@@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
@ApiParam("状态类型 10=初始化状态")
private Integer statusType;
+ @Column(name = "SEQ")
+ @ApiParam("状态点顺序")
+ private Integer seq;
+
@Transient
@ApiParam("状态点是否完成")
private boolean isComplete;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index d2e6a0b..85e63bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@@ -130,6 +130,22 @@ public class MesStationBom extends BaseBean implements Serializable {
@ApiParam("主任务编号")
private String orderNo;
+ @Transient
+ @ApiParam("产品类型代码")
+ private String produceCategoryCode;
+
+ @Transient
+ @ApiParam("产品类型名称")
+ private String produceCategoryName;
+
+ @Transient
+ @ApiParam("字符长度")
+ private Integer length;
+
+ @Transient
+ @ApiParam("校验内容")
+ private String checkContent;
+
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
index 237df3e..dd0d6b0 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
@@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
/**
* @Description :工步参数
@@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable {
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性 text select")
private String paramAttribute;
+
+ @Column(name = "EXHIBITION_KEY")
+ @ApiParam("展示key")
+ private String exhibitionKey;
+
+ @Column(name = "EXHIBITION_VALUE")
+ @ApiParam("展示value")
+ private String exhibitionValue;
+
+ @Column(name = "OBJECT_CODE")
+ @ApiParam("参数对象")
+ private String objectCode;
+
+ @Column(name = "TYPE")
+ @ApiParam("type")
+ private Integer type = 0;
+
+ @Transient
+ @ApiParam("可选值的数据")
+ private List> enumList;
+
+ @Transient
+ @ApiParam("key的值")
+ private Object geValue;
+
+ @Transient
+ @ApiParam("value的值")
+ private Object geDescription;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
index 53ce112..91a7275 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
@@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
@ApiParam("显示颜色")
private String color;
+ @Column(name = "VIN_CODE")
+ @ApiParam("Vin")
+ private String vinCode;
+
+ @Column(name = "PRODUCE_CATEGORY_CODE")
+ @ApiParam("产品位置代码")
+ private String produceCategoryCode;
+
public double getQueueSeqVal() {
return this.queueSeq == null ? 0 : this.queueSeq;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
index 6cfbd40..c67110f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
@@ -62,6 +62,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
@ApiParam("产能")
private Integer productionCapacity;
+ @Column(name = "GENERATE_TYPE")
+ @ApiParam("条码生成模式")
+ private Integer generateType;
+
@Transient
@ApiParam(value = "子集列表")
private List childTreeList;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index f244016..9cccc86 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -153,6 +153,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
+ @Lob
+ @Column(name = "EXTEND")
+ @ApiParam("扩展数据")
+ public String extend;
+
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@@ -169,9 +174,9 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
- @Column(name = "RESERVED5")
- @ApiParam("预留字段5")
- private String reserved5;
+ @Column(name = "PARENT_PART_NO")
+ @ApiParam("父阶物料号")
+ private String parentPartNo;
@Version
@Column(name = "LOCK_VERSION")
@@ -264,6 +269,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "完成按钮编号")
public String comButtonCode;
+ @Transient
+ @ApiParam("工单源序号")
+ private Double srcSeq;
+
+ @Transient
+ @ApiParam("零件号集合")
+ private String partNoList;
+
+ @Transient
+ @ApiParam("零件名称集合")
+ private String partNameList;
+
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@@ -295,4 +312,5 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
index ac78dd7..7c57d0a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
@@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
+ @Lob
+ @Column(name = "EXTEND")
+ @ApiParam("扩展数据")
+ private String extend;
+
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
- @Column(name = "RESERVED5")
- @ApiParam("预留字段5")
- private String reserved5;
-
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java
new file mode 100644
index 0000000..025ae54
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.bean.template;
+
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/6/17 8:39 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_DEFECT")
+@Api("MES_工位缺陷")
+public class MesWorkCellDefect extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -528051790747923632L;
+
+ @Column(name = "WORK_CENTER_CODE")
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
+ @Column(name = "WORK_CELL_CODE")
+ @ApiParam("工作单元代码")
+ private String workCellCode;
+
+ @Column(name = "DEFECT_CODE")
+ @ApiParam("缺陷代码")
+ private String defectCode;
+
+ @Column(name = "PART_ASSEMBLE")
+ @ApiParam("物料集")
+ private String partAssemble;
+
+ @Transient
+ @ApiParam("缺陷名称")
+ private String defectCodeName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
index 93e598e..979d50d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
@@ -55,4 +55,7 @@ public class ButtonComponentReqModel {
@ApiParam("用户信息")
private String userInfo;
+ @ApiParam("json数据")
+ private String data;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
index d97a57a..976542a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
@@ -30,4 +30,6 @@ public class CellFeedModel {
private String scanQty;
+ private String lineRemainQty;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
similarity index 93%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
index 22a3440..3d121d7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("数据复核model")
-public class DataReviewStepModel {
+public class DataReviewModel {
@ApiParam("关键件")
private String itemPartNo;
@@ -25,5 +25,4 @@ public class DataReviewStepModel {
@ApiParam("对象代码")
private String objectCode;
-
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java
new file mode 100644
index 0000000..e7a11f5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 15:23
+ * @desc
+ */
+@Data
+public class EdiFileModel implements Serializable {
+ private static final long serialVersionUID = 7085611430865514271L;
+
+ private String content;
+
+ private String fileName;
+
+ private String fileUrl;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java
new file mode 100644
index 0000000..e1361c9
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 14:51
+ * @desc
+ */
+@Data
+public class EdiRequestModel implements Serializable {
+ private static final long serialVersionUID = 7203497485903427292L;
+
+ private String organizeCode;
+
+ private String sourcePath;
+
+ private String fileName;
+
+ private String fileUrl;
+
+ private String content;
+
+ private Integer ediType;
+
+ private String ediCode;
+
+ private String host;
+
+ private String config;
+
+ private String programCode;
+
+ private String messageType;
+
+ private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java
deleted file mode 100644
index f9eeea2..0000000
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java
+++ /dev/null
@@ -1,181 +0,0 @@
-//package cn.estsh.i3plus.pojo.mes.model;
-//
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiParam;
-//import lombok.AllArgsConstructor;
-//import lombok.Data;
-//import lombok.NoArgsConstructor;
-//import org.apache.poi.ss.usermodel.CellStyle;
-//import org.springframework.util.StringUtils;
-//
-//import java.io.Serializable;
-//import java.math.BigDecimal;
-//
-///**
-// * @Author: wangjie
-// * @CreateDate: 2019/8/21 9:19 AM
-// * @Description:
-// **/
-//@Data
-//@NoArgsConstructor
-//@AllArgsConstructor
-//@Api("EXCEL参数model")
-//public class ExcelDataParamModel implements Serializable {
-//
-// public ExcelDataParamModel(Class clazz){
-// this.clazz = clazz;
-// }
-//
-// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据")
-// private Class clazz;
-//
-// @ApiParam("对应类的映射字段名，String类型")
-// private String[] strField;
-//
-// @ApiParam("对应类的标题，需要一一对应")
-// private String[] titleStr;
-//
-// @ApiParam("大标题")
-// private String title;
-//
-// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机")
-// private String fileName;
-//
-// @ApiParam("后缀")
-// private String sufix;
-//
-// @ApiParam("大标题样式")
-// private CellStyle bigTitleCellStyle;
-//
-// @ApiParam("标题样式")
-// private CellStyle titleCellStyle;
-//
-// @ApiParam("数据样式")
-// private CellStyle cellStyle;
-//
-// @ApiParam("sheet名")
-// private String sheetName;
-//
-// @ApiParam("每个格子的宽度")
-// private BigDecimal[] cellWidth;
-//
-// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序")
-// private Integer sheetNo;
-//
-// @ApiParam("导出数据转换器")
-// private QueryDataInterface queryDataInterface;
-//
-// public Class getClazz() {
-// return clazz;
-// }
-//
-// public String[] getStrField() {
-// return strField;
-// }
-//
-// public String[] getTitleStr() {
-// return titleStr;
-// }
-//
-// public String getTitle() {
-// if(StringUtils.isEmpty(this.title)){
-// return "无效的标题";
-// }else{
-// return title;
-// }
-// }
-//
-// public String getFileName() {
-// if(StringUtils.isEmpty(this.fileName)){
-// return "未命名";
-// }else{
-// return this.fileName;
-// }
-// }
-//
-// public CellStyle getBigTitleCellStyle() {
-// return bigTitleCellStyle;
-// }
-//
-// public CellStyle getTitleCellStyle() {
-// return titleCellStyle;
-// }
-//
-// public CellStyle getCellStyle() {
-// return cellStyle;
-// }
-//
-// public String getSheetName() {
-// return sheetName;
-// }
-//
-// public Integer getSheetNo() {
-// return sheetNo;
-// }
-//
-// public BigDecimal[] getCellWidth() {
-// return cellWidth;
-// }
-//
-// public String getSufix() {
-// return sufix;
-// }
-//
-// public QueryDataInterface getQueryDataInterface() {
-// return queryDataInterface;
-// }
-//
-// public void setClazz(Class clazz) {
-// this.clazz = clazz;
-// }
-//
-// public void setStrField(String[] strField) {
-// this.strField = strField;
-// }
-//
-// public void setTitleStr(String[] titleStr) {
-// this.titleStr = titleStr;
-// }
-//
-// public void setTitle(String title) {
-// this.title = title;
-// }
-//
-// public void setFileName(String fileName) {
-// this.fileName = fileName;
-// }
-//
-// public void setSufix(String sufix) {
-// this.sufix = sufix;
-// }
-//
-// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) {
-// this.bigTitleCellStyle = bigTitleCellStyle;
-// }
-//
-// public void setTitleCellStyle(CellStyle titleCellStyle) {
-// this.titleCellStyle = titleCellStyle;
-// }
-//
-// public void setCellStyle(CellStyle cellStyle) {
-// this.cellStyle = cellStyle;
-// }
-//
-// public void setSheetName(String sheetName) {
-// this.sheetName = sheetName;
-// }
-//
-// public void setCellWidth(BigDecimal[] cellWidth) {
-// this.cellWidth = cellWidth;
-// }
-//
-//
-// public void setSheetNo(Integer sheetNo) {
-// this.sheetNo = sheetNo;
-// }
-//
-// public void setQueryDataInterface(QueryDataInterface queryDataInterface) {
-// this.queryDataInterface = queryDataInterface;
-// }
-//
-//}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
new file mode 100644
index 0000000..5c9d2e3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("注塑生产控制MODEL")
+public class InjectionProductionControlModel {
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partNameRdd;
+
+ @ApiParam("当前合格数量")
+ private String standardQtyCur;
+
+ @ApiParam("当前合格数量")
+ private String completeQty;
+
+ @ApiParam("总不合格数量")
+ private String scrapQty;
+
+ @ApiParam("包装编号")
+ private String packageNo;
+
+ @ApiParam("数量")
+ private String qty;
+
+ @ApiParam("包装时间")
+ private String createDatetime;
+
+ @ApiParam("箱条码状态")
+ private String printStatusName;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
new file mode 100644
index 0000000..abf1eff
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\22 15:58
+ * @Modify:
+ **/
+@Data
+public class MesPaintSnPrintModel implements Serializable {
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+
+ @ApiParam("产品条码")
+ private String produceSn;
+
+ @ApiParam("包装编号")
+ private String packageNo;
+
+ @ApiParam("工单号")
+ private String workOrderNo;
+
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
+ @ApiParam("工作单元代码")
+ private String workCellCode;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("工厂代码")
+ private String organizeCode;
+
+ @ApiParam("打印模板")
+ private MesLabelTemplate labelTemplate;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java
index e0f1f6f..45d14ad 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java
@@ -40,6 +40,9 @@ public class MesStationBomModel {
@ApiParam("报废数")
private Integer scrapQty;
+ @ApiParam(value = "是否可重复")
+ private Integer isRepeat;
+
public MesStationBomModel() {
}
@@ -72,4 +75,19 @@ public class MesStationBomModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
+
+ public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName, Integer isRepeat) {
+ this.itemPartNo = itemPartNo;
+ this.itemPartName = itemPartName;
+ this.qty = qty;
+ this.isValid = isValid;
+ this.isDeleted = isDeleted;
+ this.organizeCode = organizeCode;
+ this.isFeed = isFeed;
+ this.workCenterCode = workCenterCode;
+ this.workCellCode = workCellCode;
+ this.parentPartNo = parentPartNo;
+ this.parentPartName = parentPartName;
+ this.isRepeat = isRepeat;
+ }
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java
new file mode 100644
index 0000000..cf9c3a1
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description : 生产工单扩展
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2020-03-30 13:42
+ * @Modify:
+ **/
+@Data
+@Api(value="生产工单扩展",description = "生产工单扩展")
+public class MesWorkOrderExtendModel extends MesWorkOrder {
+
+ @Transient
+ @ApiParam(value = "扩展数据MAP")
+ public Map extendMap;
+
+ public Map getExtendMap() {
+ try {
+ if (!StringUtils.isEmpty(super.extend)) {
+ return JSONObject.parseObject(super.extend, Map.class);
+ } else {
+ return new HashMap<>();
+ }
+ } catch (Exception e) {
+ return new HashMap<>();
+ }
+ }
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java
new file mode 100644
index 0000000..426707f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class PackageSnLabelTemplateDataModel {
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partName;
+
+ // 工单表.包装规格描述
+ @ApiParam("包装规格")
+ private Double packSpecQty;
+
+ @ApiParam("生产日期")
+ private String prodDate;
+
+ @ApiParam("工单班次")
+ private String workOrderShift;
+
+ @ApiParam("操作人员名称")
+ private String operatorName;
+
+ @ApiParam("工厂名称")
+ private String organizeName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java
new file mode 100644
index 0000000..ae0de27
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnModel.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 条码解绑实体
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class PackageSnModel {
+
+ @ApiParam("包装条码")
+ private String packageNo;
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partName;
+
+ @ApiParam("批次")
+ private String lotNo;
+
+ @ApiParam("创建人")
+ private String createUser;
+
+ @ApiParam("创建时间")
+ private String createDateTime;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
new file mode 100644
index 0000000..8dfadf4
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/6/28 8:06 PM
+ * @Description:
+ **/
+@Data
+@Api("涂装检测MODEL")
+public class PaintCheckModel {
+
+ @ApiParam("工作中心")
+ private String workCenterCode;
+
+ @ApiParam("工作单元")
+ private String workCellCode;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partNameRdd;
+
+ @ApiParam("颜色")
+ private String color;
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+
+ @ApiParam("界面编号")
+ private String windowNo;
+
+ @ApiParam("缺陷标识值")
+ private String defectFlagValue;
+
+ @ApiParam("不良品处理类型")
+ private Integer defectActionType;
+
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+
+ @ApiParam("缺陷列表")
+ private List defectList;
+
+ @ApiParam("界面组件参数数据")
+ List windowModuleParamList;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
new file mode 100644
index 0000000..9ab41c8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/6/21 8:06 PM
+ * @Description:
+ **/
+@Data
+@Api("涂装上线MODEL")
+public class PaintOnLineModel {
+
+ @ApiParam("工作中心")
+ private String workCenterCode;
+
+ @ApiParam("工作单元")
+ private String workCellCode;
+
+ @ApiParam("工单号")
+ private String workOrderNo;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partNameRdd;
+
+ @ApiParam("颜色")
+ private String color;
+
+ @ApiParam("工单数量")
+ private Double orderNum;
+
+ @ApiParam("包装数量")
+ private Double packageNum;
+
+ @ApiParam("项目名称")
+ private String productName;
+
+ @ApiParam("创建时间")
+ private String createDateTime;
+
+ @ApiParam("圈数")
+ private Integer rounds;
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
new file mode 100644
index 0000000..b6c5a7f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : 涂装工单条码-展示组件model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("涂装工单条码展示组件model")
+public class PaintWorkOrderSnModel extends BaseBean {
+
+ @ApiParam("工单号")
+ private String orderNo;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partName;
+
+ @ApiParam("颜色代码")
+ private String colorCode;
+
+ @ApiParam("颜色名称")
+ private String colorName;
+
+ @ApiParam("工单数量")
+ private Double workOrderQty;
+
+ @ApiParam("包装数量")
+ private Double packageQty;
+
+ @ApiParam("项目名称")
+ private String prodCfgTypeName;
+
+ @ApiParam("圈数")
+ private Integer groupNum;
+
+ @ApiParam("工单状态")
+ private Integer workOrderStatus;
+
+ // 父阶物料号 -- 涂装客户标签打印
+ @ApiParam("父阶物料号")
+ private String parentPartNo;
+
+ // 父阶物料名称 -- 涂装二次条码打印
+ @ApiParam("父阶物料名称")
+ private String parentPartName;
+
+ private List prodPackageList;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java
new file mode 100644
index 0000000..6891043
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcEquStatusModel.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PlcEquStatusModel implements Serializable {
+
+ // 主站/从站
+ @ApiParam("站位")
+ private String stationPosition;
+
+ // 站位IP
+ @ApiParam("IP地址")
+ private String ipAddress;
+
+ // IP状态 -- 连接/断开
+ @ApiParam("IP状态")
+ private Integer ipStatus;
+
+ // 电检设备名称
+ @ApiParam("电检设备名称")
+ private String electricalEqu;
+
+ // 电检设备状态哦 -- 连接/断开
+ @ApiParam("电检设备状态")
+ private Integer electricalEquStatus;
+
+ // 产线状态
+ @ApiParam("产线状态")
+ private Integer workCenterStatus;
+
+ @ApiParam("停机类型")
+ private Integer stopType;
+
+ @ApiParam("产品条码")
+ private String productSn;
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partName;
+
+ @ApiParam("工作中心代码")
+ private String workCenterCode;
+
+ @ApiParam("工作单元代码")
+ private String workCellCode;
+
+ @ApiParam("停机开始时间")
+ private String stopStartTime;
+
+ @ApiParam("停机结束时间")
+ private String stopEndTime;
+
+ @ApiParam("停机原因")
+ private String stopReason;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
new file mode 100644
index 0000000..63903d3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 涂装工单条码-展示组件(产品包装)model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@Api("产品包装model")
+public class ProdPackModel implements Serializable {
+
+ // 产品条码表--产品条码
+ @ApiParam("产品条码")
+ public String productSn;
+
+ // 包装主表--包装编号
+ @ApiParam("一检箱条码")
+ public String packageNo;
+
+ // 包装明细表--创建时间
+ @ApiParam("一检校验时间")
+ public String createDatetime;
+
+ // 包装主表--打印状态(10：未打印 20：已打印)
+ @ApiParam("箱条码状态")
+ public Integer printStatus;
+
+ // 涂装客户标签打印
+ @ApiParam("客户标签")
+ public String custSn;
+
+ // 涂装客户标签打印
+ @ApiParam("当前工序")
+ public String processCode;
+
+ // 涂装客户标签打印
+ @ApiParam("更新时间")
+ public String modifyDateTime;
+
+ @ApiParam("工单号")
+ public String workOrderNo;
+
+ @ApiParam("组织代码")
+ public String organizeCode;
+
+ @ApiParam("物料号")
+ public String parentPartNo;
+
+ public ProdPackModel() {
+ }
+
+ public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
+ this.productSn = productSn;
+ this.packageNo = packageNo;
+ this.createDatetime = createDatetime;
+ this.printStatus = printStatus;
+ }
+
+ public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+ this.productSn = productSn;
+ this.packageNo = packageNo;
+ this.custSn = custSn;
+ this.processCode = processCode;
+ this.modifyDateTime = modifyDateTime;
+ }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java
new file mode 100644
index 0000000..83fd71f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 17:17
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueueJitPlanModel {
+
+ private MesQueueJitPlan jitPlan;
+
+ private List jitPlanDetails;
+
+ private List jitPlanBoms;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index bf91927..f128cd8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -81,12 +81,16 @@ public class QueueOrderModel implements Serializable {
@ApiParam("JIT队列批次")
private String jitLotNo;
+
@ApiParam("vin")
private String vinCode;
@ApiParam("客户JIT队列编号")
private String jitActualNo;
+ @ApiParam("产品位置")
+ private String produceCategoryCode;
+
public QueueOrderModel() {
}
@@ -231,9 +235,9 @@ public class QueueOrderModel implements Serializable {
this.serialNumber=serialNumber;
}
- //料架分组队列展示组件
+ //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
- Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) {
+ Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
this.queueGroupNo = queueGroupNo;
this.groupNo = groupNo;
this.orderNo = orderNo;
@@ -242,13 +246,16 @@ public class QueueOrderModel implements Serializable {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.organizeCode = organizeCode;
+ this.vinCode = vinCode;
+ this.produceCategoryCode = produceCategoryCode;
}
- public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) {
+ public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
this.id = id;
this.queueGroupNo = queueGroupNo;
this.jitLotNo = jitLotNo;
this.vinCode = vinCode;
this.organizeCode = organizeCode;
+ this.produceCategoryCode = produceCategoryCode;
}
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index bb6d667..07cadf3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -138,9 +138,27 @@ public class StationRequestBean implements Serializable {
@ApiParam("工步弹框状态")
private Boolean stepDialogStatus = false;
+ @ApiParam("是否按时完成")
+ private Integer isOnTimeComplete = 1;
+
+ @ApiParam("工位剩余时间")
+ private Long remainWorkTime;
+
+ @ApiParam("是否操作超时")
+ private Integer isTimeOut = 2;
+
@ApiParam("特殊展示数据")
private Map specialDisplayMap = new HashMap<>();
+ @ApiParam("物料名称")
+ private String partName;
+
+ @ApiParam("状态机代码")
+ private String smCode;
+
+ @ApiParam("区域代码")
+ private String areaCode;
+
@Override
public String toString() {
return "StationRequestBean{" +
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java
index 46db502..f039ece 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -58,4 +59,7 @@ public class StationResultBean implements Serializable {
@ApiParam("特殊展示数据")
private Object specialDisplayData;
+
+ @ApiParam("工位参数")
+ private Map wcpcMap = new HashMap<>();
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
index 5f95f8f..2ac3a02 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
@@ -101,4 +101,11 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("包装数量")
private Integer pgCodeNum;
+ @ApiParam("批次")
+ private String lotNo;
+ @ApiParam("备注")
+ private String memo;
+ @ApiParam("产品配置名称")
+ private String prodCfgCodeName;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java
new file mode 100644
index 0000000..fb93d98
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 总装生产工单导入模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/6/12 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="总装生产工单导入模板",description = "总装生产工单导入模板")
+public class ZzMesWorkOrderModel extends BaseBean {
+
+ private static final long serialVersionUID = 5790342327875846646L;
+ @ApiParam(value = "日期")
+ @AnnoOutputColumn
+ private String workDate;
+
+ @ApiParam(value = "班次")
+ @AnnoOutputColumn
+ private String shiftName;
+
+ @ApiParam(value = "项目名称")
+ @AnnoOutputColumn(required = false)
+ private String prodCfgTypeName;
+
+ @ApiParam(value = "SAP物料号")
+ @AnnoOutputColumn
+ private String partNo;
+
+ @ApiParam(value = "产品名称")
+ @AnnoOutputColumn(required = false)
+ private String partName;
+
+ @ApiParam(value = "产线代码")
+ private String workCenterCode;
+
+ @ApiParam(value = "计划数")
+ @AnnoOutputColumn
+ private String qty;
+
+ @ApiParam(value = "标包")
+ @AnnoOutputColumn(required = false)
+ private String snp;
+
+ @ApiParam(value = "包装规格")
+ @AnnoOutputColumn
+ private String packageSpec;
+
+ @ApiParam(value = "备注")
+ @AnnoOutputColumn(required = false)
+ private String memo;
+
+ @ApiParam(value = "行数")
+ @AnnoOutputColumn(required = false)
+ private Integer rows;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java
new file mode 100644
index 0000000..50601e8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:36
+ * @desc
+ */
+@Data
+@XStreamAlias("coderule")
+public class CodeRule implements Serializable {
+ private static final long serialVersionUID = 6090471998165282835L;
+
+ @XStreamAlias("code")
+ private String code;
+
+ @XStreamAlias("type")
+ private String type;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java
new file mode 100644
index 0000000..cfe4ed4
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:32
+ * @desc
+ */
+@Data
+@XStreamAlias("document")
+public class Document implements Serializable {
+ private static final long serialVersionUID = 2814403876905527454L;
+
+ @XStreamAlias("head")
+ private Head head;
+
+ @XStreamAlias("message")
+ private Message message;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java
new file mode 100644
index 0000000..4d2528a
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:32
+ * @desc
+ */
+@Data
+@XStreamAlias("head")
+public class Head implements Serializable {
+ private static final long serialVersionUID = 7799977037966652535L;
+
+ @XStreamAlias("customerno")
+ private String customerno;
+
+ @XStreamAlias("customername")
+ private String customername;
+
+ @XStreamAlias("plantcode")
+ private String plantcode;
+
+ @XStreamAlias("plantname")
+ private String plantname;
+
+ @XStreamAlias("suppliernumber")
+ private String suppliernumber;
+
+ @XStreamAlias("suppliername")
+ private String suppliername;
+
+ @XStreamAlias("status")
+ private String status;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java
new file mode 100644
index 0000000..ef61c84
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:33
+ * @desc
+ */
+@Data
+@XStreamAlias("message")
+public class Message implements Serializable {
+ private static final long serialVersionUID = 8628748312808962449L;
+
+ @XStreamImplicit
+ private List pns;
+
+ @XStreamAlias("customerno")
+ private String customerNo;
+
+ @XStreamAlias("customername")
+ private String customerName;
+
+ @XStreamAlias("plantcode")
+ private String plantCode;
+
+ @XStreamAlias("plantname")
+ private String plantName;
+
+ @XStreamAlias("suppliernumber")
+ private String supplierNumber;
+
+ @XStreamAlias("suppliername")
+ private String supplierName;
+
+ @XStreamAlias("status")
+ private String status;
+
+ @XStreamAlias("sequenceno")
+ private String sequenceNo;
+
+ @XStreamAlias("vin")
+ private String vin;
+
+ @XStreamAlias("date")
+ private String date;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java
new file mode 100644
index 0000000..a493487
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java
@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/27 15:39
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+public class MgnBjJitPlanModel {
+
+ private String org;
+
+ private String userInfo;
+
+ private List flPnParts;
+
+ private String flPnRecipe;
+
+ private List frPnParts;
+
+ private String frPnRecipe;
+
+ private List rlPnParts;
+
+ private String rlPnRecipe;
+
+ private List rrPnParts;
+
+ private String rrPnRecipe;
+
+ private Map> groupPartsMap = new HashMap<>();
+
+ public void setFlPnParts(List flPnParts) {
+ this.groupPartsMap.put("FL", flPnParts);
+ this.flPnRecipe = getGroupRecipe(flPnParts);
+ this.flPnParts = flPnParts;
+ }
+
+ public void setFrPnParts(List frPnParts) {
+ this.groupPartsMap.put("FR", frPnParts);
+ this.frPnRecipe = getGroupRecipe(frPnParts);
+ this.frPnParts = frPnParts;
+ }
+
+ public void setRlPnParts(List rlPnParts) {
+ this.groupPartsMap.put("RL", rlPnParts);
+ this.rlPnRecipe = getGroupRecipe(rlPnParts);
+ this.rlPnParts = rlPnParts;
+ }
+
+ public void setRrPnParts(List rrPnParts) {
+ this.groupPartsMap.put("RR", rrPnParts);
+ this.rrPnRecipe = getGroupRecipe(rrPnParts);
+ this.rrPnParts = rrPnParts;
+ }
+
+ public MgnBjJitPlanModel(String org, String userInfo) {
+ this.org = org;
+ this.userInfo = userInfo;
+ }
+
+ private String getGroupRecipe(List groupParts) {
+ List groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq()))
+ .sorted(Comparator.comparing(Part::getRecipeSeq))
+ .map(Part::getRecipeItem)
+ .collect(Collectors.toList());
+ return String.join("", groupPartsRecipe);
+ }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java
new file mode 100644
index 0000000..e61fa14
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/30 15:24
+ * @desc
+ */
+@Data
+public class MgnBjRecipePartsModel {
+
+ private String location;
+
+ private String recipe;
+
+ private List parts;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java
new file mode 100644
index 0000000..8a7070f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:36
+ * @desc
+ */
+@Data
+@XStreamAlias("optioncode")
+public class OptionCode implements Serializable {
+ private static final long serialVersionUID = -4790746701135990728L;
+
+ @XStreamAlias("coderule")
+ private List codeRules;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
new file mode 100644
index 0000000..f6024e5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:35
+ * @desc
+ */
+@Data
+@XStreamAlias("part")
+public class Part implements Serializable {
+ private static final long serialVersionUID = -8947770816754458901L;
+
+ @XStreamAlias("item")
+ private String item;
+
+ @XStreamAlias("dock")
+ private String dock;
+
+ @XStreamAlias("qty")
+ private String qty;
+
+ @ApiParam("是否是baseModule")
+ private boolean isBaseModule;
+
+ @ApiParam("前左数量")
+ private String flQty;
+
+ @ApiParam("前右数量")
+ private String frQty;
+
+ @ApiParam("后左数量")
+ private String rlQty;
+
+ @ApiParam("后右数量")
+ private String rrQty;
+
+ @ApiParam("产品位置")
+ private String produceCtgyCode;
+
+ @ApiParam("配方")
+ private String recipeItem;
+
+ @ApiParam("配方顺序")
+ private String recipeSeq;
+
+
+ @ApiParam("Mes物料号")
+ private String partNo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java
new file mode 100644
index 0000000..740b5a0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:35
+ * @desc
+ */
+@Data
+@XStreamAlias("parts")
+public class Parts implements Serializable {
+ private static final long serialVersionUID = -7294906162624860932L;
+
+ @XStreamAlias("parts")
+ private List parts;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
new file mode 100644
index 0000000..c1d74b6
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/6/23 12:33
+ * @desc
+ */
+@Data
+@XStreamAlias("PN")
+public class Pn implements Serializable {
+ private static final long serialVersionUID = 194164925380216505L;
+
+ @XStreamAlias("vin")
+ private String vin;
+
+ @XStreamAlias("seqno")
+ private String seqno;
+
+ @XStreamAlias("date")
+ private String date;
+
+ @XStreamAlias("vehicleCode")
+ private String vehicleCode;
+
+ @XStreamAlias("version")
+ private String version;
+
+ @XStreamAlias("parts")
+ private List parts;
+
+ @XStreamAlias("optioncode")
+ private List codeRules;
+
+ @ApiParam("新vin号")
+ private String newVin;
+
+ @ApiParam("新vin号")
+ private Boolean result;
+
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.java
new file mode 100644
index 0000000..3da78a6
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/EquOperationStatusMonitorRepository.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.MesEquipment;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface EquOperationStatusMonitorRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java
new file mode 100644
index 0000000..6e3b966
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDefectDataRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfDefectData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : if不良信息接口
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-28 16:49
+ * @Modify:
+ **/
+@Repository
+public interface IfDefectDataRepository extends BaseRepository {
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java
new file mode 100644
index 0000000..63e234d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.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.IfEdiInitialData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface IfEdiInitialDataRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java
index 0e8dd97..9553592 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerRepository.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfDismantleRecord;
import cn.estsh.i3plus.pojo.mes.bean.MesContainer;
+import org.springframework.stereotype.Repository;
/**
* @Description:
@@ -11,5 +12,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesContainer;
* @CreateDate: 2019\11\18 10:33
* @Modify:
**/
+@Repository
public interface MesContainerRepository extends BaseRepository {
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java
new file mode 100644
index 0000000..a3792ea
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerTypeRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesContainerType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/6/24 3:34 下午
+ * @Modify:
+ */
+@Repository
+public interface MesContainerTypeRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java
new file mode 100644
index 0000000..031775b
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.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.MesEdiParserConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesEdiParserConfigRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java
new file mode 100644
index 0000000..2f6f967
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesExtendObjectCfgRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesExtendObjectCfg;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesExtendObjectCfgRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java
new file mode 100644
index 0000000..0d17747
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMouldPartRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesMouldPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesMouldPartRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java
new file mode 100644
index 0000000..9d81a01
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProdCfgTypeRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartProdCfgType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate: 2020\06\17 14:01
+ */
+@Repository
+public interface MesPartProdCfgTypeRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java
new file mode 100644
index 0000000..4f17599
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartTaktRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartTakt;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartTaktRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.java
new file mode 100644
index 0000000..80e0299
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdWorkCenterRepository.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.MesProdWorkCenter;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesProdWorkCenterRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java
new file mode 100644
index 0000000..2ffeac0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScatterBomCfgRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate: 2020\06\17 14:01
+ */
+@Repository
+public interface MesScatterBomCfgRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java
new file mode 100644
index 0000000..43b09f2
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/6/17 8:46 下午
+ * @Modify:
+ */
+@Repository
+public interface MesWorkCellDefectRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java
new file mode 100644
index 0000000..be056c0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
+import org.springframework.stereotype.Repository;
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/6/17 8:46 下午
+ * @Modify:
+ */
+@Repository
+public interface MesWorkCellDefectsRepository 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 481a9f1..767ad06 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
@@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate;
import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails;
+import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect;
import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -1514,7 +1515,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
}
if (mesQcCheckStandard.getCheckType() != null) {
- DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
+ DdlPreparedPack.getNumEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
@@ -1526,7 +1527,6 @@ public class MesHqlPack {
}
/**
- * <<<<<<< Updated upstream
* MES 缺陷查询条件封装
*
* @param mesDefect
@@ -2942,4 +2942,260 @@ public class MesHqlPack {
}
return packBean;
}
+
+ /**
+ * 物料校验项
+ * @param partCheck
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesPartCheck(MesPartCheck partCheck, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(partCheck, organizeCode);
+ if (!StringUtils.isEmpty(partCheck.getPartNo())) {
+ DdlPreparedPack.getStringEqualPack(partCheck.getPartNo(), "partNo", packBean);
+ }
+ if (!StringUtils.isEmpty(partCheck.getObjectCode())) {
+ DdlPreparedPack.getStringEqualPack(partCheck.getObjectCode(), "objectCode", packBean);
+ }
+ return packBean;
+ }
+
+
+ /**
+ * 过程质量检测数据
+ *
+ * @param qcOrderDetail
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesQcOrderDetailData(MesQcOrderDetail qcOrderDetail, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrderDetail, organizeCode);
+ if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
+ DdlPreparedPack.getStringRightLikerPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
+ }
+ if (qcOrderDetail.getCheckType() != null) {
+ DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+ }
+ if (!StringUtils.isEmpty(qcOrderDetail.getSerialNumber())) {
+ DdlPreparedPack.getStringLikerPack(qcOrderDetail.getSerialNumber(), "serialNumber", packBean);
+ }
+ if (!StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrderDetail.getCreateDateTimeEnd())) {
+ DdlPreparedPack.timeBuilder(
+ qcOrderDetail.getCreateDateTimeStart(),
+ qcOrderDetail.getCreateDateTimeEnd(),
+ "createDatetime", packBean, true);
+ }
+ return packBean;
+ }
+
+ /**
+ * MES AGV停机记录信息条件查询
+ * @param stopRecord
+ * @return
+ */
+ public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) {
+ DdlPackBean packBean = getAllBaseData(organizeCode);
+ DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean);
+ DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
+ DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean);
+ DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean);
+ DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean);
+ if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) {
+ DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(),
+ "stopStartTime", packBean, true);
+ }
+ return packBean;
+ }
+
+ /**
+ * MES 工位缺陷查询条件封装
+ *
+ * @param workCellDefect
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesWorkCellDefect(MesWorkCellDefect workCellDefect, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(workCellDefect, organizeCode);
+ if (!StringUtils.isEmpty(workCellDefect.getDefectCode())) {
+ DdlPreparedPack.getStringLikerPack(workCellDefect.getDefectCode(), "defectCode", packBean);
+ }
+ if (!StringUtils.isEmpty(workCellDefect.getWorkCellCode())) {
+ DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCellCode(), "workCellCode", packBean);
+ }
+ if (!StringUtils.isEmpty(workCellDefect.getWorkCenterCode())) {
+ DdlPreparedPack.getStringLikerPack(workCellDefect.getWorkCenterCode(), "workCenterCode", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 散件BOM
+ *
+ * @param scatterBomCfg
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesScatterBomCfg(MesScatterBomCfg scatterBomCfg, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(scatterBomCfg, organizeCode);
+ if (!StringUtils.isEmpty(scatterBomCfg.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(scatterBomCfg.getPartNo(), "partNo", packBean);
+ }
+ if (!StringUtils.isEmpty(scatterBomCfg.getCustomerPartNo())) {
+ DdlPreparedPack.getStringLikerPack(scatterBomCfg.getCustomerPartNo(), "customerPartNo", packBean);
+ }
+ if (!StringUtils.isEmpty(scatterBomCfg.getWorkCellCode())) {
+ DdlPreparedPack.getStringLikerPack(scatterBomCfg.getWorkCellCode(), "workCellCode", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 物料项目关系
+ *
+ * @param partProdCfgType
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesPartProdCfgType(MesPartProdCfgType partProdCfgType, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(partProdCfgType, organizeCode);
+ if (!StringUtils.isEmpty(partProdCfgType.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(partProdCfgType.getPartNo(), "partNo", packBean);
+ }
+ if (!StringUtils.isEmpty(partProdCfgType.getCustCode())) {
+ DdlPreparedPack.getStringLikerPack(partProdCfgType.getCustCode(), "custCode", packBean);
+ }
+ if (!StringUtils.isEmpty(partProdCfgType.getProdCfgTypeCode())) {
+ DdlPreparedPack.getStringLikerPack(partProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 编码规则映射表
+ *
+ * @param encodeRuleMap
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesEncodeRuleMap(MesEncodeRuleMap encodeRuleMap, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(encodeRuleMap, organizeCode);
+ if (!StringUtils.isEmpty(encodeRuleMap.getTypeCode())) {
+ DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeCode(), "typeCode", packBean);
+ }
+ if (!StringUtils.isEmpty(encodeRuleMap.getTypeName())) {
+ DdlPreparedPack.getStringLikerPack(encodeRuleMap.getTypeName(), "typeName", packBean);
+ }
+ if (!StringUtils.isEmpty(encodeRuleMap.getBusinessCode())) {
+ DdlPreparedPack.getStringLikerPack(encodeRuleMap.getBusinessCode(), "businessCode", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 扩展对象配置
+ * @param extendObjectCfg
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesExtendObjectCfg(MesExtendObjectCfg extendObjectCfg, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(extendObjectCfg, organizeCode);
+ if (!StringUtils.isEmpty(extendObjectCfg.getObjectCode())) {
+ DdlPreparedPack.getStringLikerPack(extendObjectCfg.getObjectCode(), "objectCode", packBean);
+ }
+ if (!StringUtils.isEmpty(extendObjectCfg.getFieldCode())) {
+ DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldCode(), "fieldCode", packBean);
+ }
+ if (!StringUtils.isEmpty(extendObjectCfg.getFieldName())) {
+ DdlPreparedPack.getStringLikerPack(extendObjectCfg.getFieldName(), "fieldName", packBean);
+ }
+ if (!StringUtils.isEmpty(extendObjectCfg.getFieldType())) {
+ DdlPreparedPack.getNumEqualPack(extendObjectCfg.getFieldType(), "fieldType", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 产品工作中心配置
+ * @param prodWorkCenter
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesProdWorkCenter(MesProdWorkCenter prodWorkCenter, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(prodWorkCenter, organizeCode);
+ if (!StringUtils.isEmpty(prodWorkCenter.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(prodWorkCenter.getPartNo(), "partNo", packBean);
+ }
+ if (!StringUtils.isEmpty(prodWorkCenter.getWorkCenterCode())) {
+ DdlPreparedPack.getStringLikerPack(prodWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 客户JIT预装队列
+ * @param queueJitPlan
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode);
+ if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean);
+ }
+ if (queueJitPlan.getStatus() != null) {
+ DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
+ DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+ "createDatetime", packBean, true);
+ }
+ if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
+ DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
+ "createDatetime", packBean, true);
+ }
+ return packBean;
+ }
+
+ /**
+ * 客户JIT预装队列明细
+ * @param queueJitPlanDetail
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode);
+ if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean);
+ }
+ return packBean;
+ }
+
+ /**
+ * 客户JIT预装队列BOM
+ * @param queueJitPlanBom
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode);
+ if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean);
+ }
+ if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean);
+ }
+ return packBean;
+ }
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 9d81d04..ce8737a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.*;
@@ -357,6 +356,10 @@ public class MesPcnHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
}
+ if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
+ DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+ }
+
// 时间段查询
if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
@@ -616,4 +619,49 @@ public class MesPcnHqlPack {
return endIndex;
}
+ /**
+ * 涂装一次箱条码打印获取工单 查询条件封装
+ *
+ * @param mesWorkOrder
+ * @return
+ */
+ public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) {
+ DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode);
+ if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
+ DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
+ DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
+ DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
+ DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
+ DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+ }
+ // 时间段查询
+ if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+ DdlPreparedPack.timeBuilder(
+ mesWorkOrder.getStartTimeStart(),
+ mesWorkOrder.getStartTimeEnd(),
+ "startTime", packBean, true);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+ DdlPreparedPack.timeBuilder(
+ mesWorkOrder.getEndTimeStart(),
+ mesWorkOrder.getEndTimeEnd(),
+ "endTime", packBean, true);
+ }
+ if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+ DdlPreparedPack.timeBuilder(
+ mesWorkOrder.getCreateDateTimeStart(),
+ mesWorkOrder.getCreateDateTimeEnd(),
+ "createDatetime", packBean, true);
+ }
+
+ return packBean;
+ }
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index fb51da0..be533a6 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
@@ -59,6 +59,19 @@
i3plus-pojo-lac
+
+
+ org.optaplanner
+ optaplanner-core
+ 7.36.0.Final
+
+
+
+ org.optaplanner
+ optaplanner-persistence-jpa
+ 7.36.0.Final
+
+
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
index 57c8ee6..8055c00 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
@@ -102,6 +102,9 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String createDateTime;
+ @Transient
+ public String receiveDateTime;
+
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
index a5a4d10..33bed63 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
@@ -116,6 +116,9 @@ public class WmsActionResponseBean implements Serializable {
@ApiParam(value = "分组KEY")
public String groupKey;
+ @ApiParam(value = "工厂代码")
+ private String organizeCode;
+
public WmsActionResponseBean(Boolean codeStatus, String message) {
this.codeStatus = codeStatus;
this.message = message;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
index 6bfdd58..2c30912 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
@@ -17,6 +17,7 @@ public class WmsJobParamModel implements Serializable {
private static final long serialVersionUID = 5784492509251527816L;
private String organizeCode;//工厂代码
private List zonesNoList;//存储区编号
+ private String src;//单据来源枚举
private Integer snType;//条码类型（虚拟，实物）
private String devOpsEmail;//运维人员邮箱
private Integer minuteDiff;//处理周期(分钟)
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java
new file mode 100644
index 0000000..00439af
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLocateListModel.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.model.wms.engine.domain.WmsThreeDimenLocateModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 3D仓库-库位优化模型
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/6/1 14:22
+ * @Modify
+ */
+@Data
+public class WmsLocateListModel implements Serializable {
+ private static final long serialVersionUID = -2672721389336190491L;
+
+ List unsolvedLocates;
+
+ String organizeCode;
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java
new file mode 100644
index 0000000..32d4268
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateAssign.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.model.wms.engine.domain;
+
+import lombok.Getter;
+import org.optaplanner.core.api.domain.solution.PlanningEntityCollectionProperty;
+import org.optaplanner.core.api.domain.solution.PlanningScore;
+import org.optaplanner.core.api.domain.solution.PlanningSolution;
+import org.optaplanner.core.api.domain.solution.drools.ProblemFactCollectionProperty;
+import org.optaplanner.core.api.domain.valuerange.ValueRangeProvider;
+import org.optaplanner.core.api.score.buildin.hardsoft.HardSoftScore;
+
+import java.util.List;
+
+@PlanningSolution
+public class LocateAssign {
+
+ private List wmsThreeDimenLocateModelList;
+ private List locationList;
+ /**
+ * 平均进出库次数，用于分数计算
+ */
+ @Getter
+ private int avgLocateFrequence;
+
+ private HardSoftScore score;
+
+ @ValueRangeProvider(id = "locationRange")
+ @ProblemFactCollectionProperty
+ public List getLocationList() {
+ return this.locationList;
+ }
+
+ public void setLocationList(List locationList) {
+ this.locationList = locationList;
+ }
+
+ @PlanningEntityCollectionProperty
+ public List getWmsThreeDimenLocateModelList() {
+ return this.wmsThreeDimenLocateModelList;
+ }
+
+ public void setWmsThreeDimenLocateModelList(List wmsThreeDimenLocateModelList) {
+ this.wmsThreeDimenLocateModelList = wmsThreeDimenLocateModelList;
+
+ long totalFrequence = 0;
+
+ for (WmsThreeDimenLocateModel wmsThreeDimenLocateModel : wmsThreeDimenLocateModelList) {
+ totalFrequence += wmsThreeDimenLocateModel.getFrequency();
+ }
+ // 计算平均进出库次数
+ this.avgLocateFrequence = (int)(totalFrequence / wmsThreeDimenLocateModelList.size());
+ }
+
+ @PlanningScore
+ public HardSoftScore getScore() {
+ return this.score;
+ }
+
+ public void setScore(HardSoftScore score) {
+ this.score = score;
+ }
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java
new file mode 100644
index 0000000..c1d191f
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocateStrengthComparator.java
@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.model.wms.engine.domain;
+
+
+import java.util.Comparator;
+
+public class LocateStrengthComparator implements Comparator {
+ @Override
+ public int compare(WmsThreeDimenLocateModel o1, WmsThreeDimenLocateModel o2) {
+ return o1.getFrequency() - o2.getFrequency();
+ }
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java
new file mode 100644
index 0000000..d097975
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/LocationStrengthComparator.java
@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.model.wms.engine.domain;
+
+
+import java.util.Comparator;
+
+public class LocationStrengthComparator implements Comparator {
+ @Override
+ public int compare(Integer seq1, Integer seq2) {
+ return seq1 - seq2;
+ }
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java
new file mode 100644
index 0000000..8167e1f
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/engine/domain/WmsThreeDimenLocateModel.java
@@ -0,0 +1,114 @@
+package cn.estsh.i3plus.pojo.model.wms.engine.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.optaplanner.core.api.domain.entity.PlanningEntity;
+import org.optaplanner.core.api.domain.lookup.PlanningId;
+import org.optaplanner.core.api.domain.variable.PlanningVariable;
+
+
+/**
+ * 库位
+ */
+@PlanningEntity(difficultyComparatorClass = LocateStrengthComparator.class)
+public class WmsThreeDimenLocateModel {
+ /**
+ * 工厂代码
+ */
+ @Getter
+ @Setter
+ private String organizeCode;
+ /**
+ * 仓库编码
+ */
+ @Getter
+ @Setter
+ private String whNo;
+ /**
+ * 存储区编码
+ */
+ @Getter
+ @Setter
+ private String zoneNo;
+ /**
+ * 家具编码
+ */
+ @Getter
+ @Setter
+ private String furnitureNo;
+ /**
+ * 库位代码
+ */
+ @Getter
+ @Setter
+ @PlanningId
+ private String locateNo;
+ /**
+ * X
+ */
+ @Getter
+ @Setter
+ private int x;
+
+ /**
+ * X
+ */
+ @Getter
+ @Setter
+ private int y;
+
+ /**
+ * X
+ */
+ @Getter
+ @Setter
+ private int z;
+ /*
+ 库位在指定时间内的移动频率
+ */
+ @Getter
+ @Setter
+ private int frequency;
+ /**
+ * 库位的原始坐标
+ */
+ @Getter
+ @Setter
+ private int originSeq;
+ /**
+ * 库位当前的坐标，此处只用了一纬坐标，二维坐标需要映射到一纬空间内
+ */
+ private int destSeq;
+
+
+ public WmsThreeDimenLocateModel() {
+ }
+
+ //3D仓库-库位移动频率热力图
+ public WmsThreeDimenLocateModel(String organizeCode, String whNo, String zoneNo,
+ String locateNo, Integer seq, Long frequency, String furnitureNo,
+ Integer x, Integer y, Integer z) {
+ this.organizeCode = organizeCode;
+ this.whNo = whNo;
+ this.zoneNo = zoneNo;
+ this.locateNo = locateNo;
+ this.originSeq = seq;
+ this.destSeq = seq;
+ this.frequency = Integer.parseInt(frequency.toString());
+ this.furnitureNo = furnitureNo;
+ this.x = x;
+ this.y = y;
+ this.z = z;
+ }
+
+ @PlanningVariable(valueRangeProviderRefs = {"locationRange"},
+ strengthComparatorClass = LocationStrengthComparator.class)
+ public Integer getDestSeq() {
+ return this.destSeq;
+ }
+
+ public void setDestSeq(Integer destSeq) {
+ this.destSeq = destSeq;
+ }
+
+}
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 78bbdef..14e8567 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
index 9afa74c..643cb74 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
@@ -54,10 +54,16 @@ public class SysUser extends BaseBean {
@ApiParam(value ="工号")
private String userEmpNo;
+ @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
+ @Column(name="USER_LOGIN_PASSWORD_ID")
+ @ApiParam(value ="密码ID" , example = "-1")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userLoginPasswordId;
+
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
private Integer userType;
@@ -78,6 +84,7 @@ public class SysUser extends BaseBean {
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
+ @Deprecated
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="账号最后登录时间")
private String userLoginLastDateTime;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java
new file mode 100644
index 0000000..bd94c41
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : wei.peng
+ * @CreateDate : 20-6-4 下午3:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_PASSWORD")
+@Api(value="账号密码")
+public class SysUserPassword extends BaseBean {
+ private static final long serialVersionUID = 4536854582252378921L;
+
+ @Column(name="USER_ID")
+ @ApiParam(value ="人员ID" , example = "-1")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ @Column(name="USER_PASSWORD")
+ @ApiParam(value ="用户密码")
+ private String userPassword;
+
+ @Column(name="USER_LOGIN_LAST_DATE_TIME")
+ @ApiParam(value ="账号最后登录时间")
+ private String userLoginLastDateTime;
+
+ public SysUserPassword() {
+ }
+
+ public SysUserPassword(Long userId, String userPassword) {
+ this.userId = userId;
+ this.userPassword = userPassword;
+ }
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
index 7d49ff3..d53eb6b 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
@@ -10,9 +10,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
-import javax.persistence.Entity;
import javax.persistence.Table;
/**
@@ -23,7 +23,7 @@ import javax.persistence.Table;
* @Modify:
**/
@Data
-@Entity
+@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
index eed1578..90e1854 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -23,7 +24,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
-@Entity
+@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
index ce575dc..f14accf 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
-@Entity
+@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
index 2c6c575..c45cd05 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -26,7 +27,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
-@Entity
+@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
index 23f1a00..9d1de96 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
@@ -12,9 +12,9 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
import javax.persistence.Column;
-import javax.persistence.Entity;
import javax.persistence.Table;
/**
@@ -25,7 +25,7 @@ import javax.persistence.Table;
* @Modify :
**/
@Data
-@Entity
+@Document
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java
deleted file mode 100644
index 749dd25..0000000
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
-
-/**
- * @Description : 定时任务执行记录
- * @Reference :
- * @Author : wei.peng
- * @Date : 2018-10-22 12:03:01.409
- * @Modify :
- **/
-public interface SysTaskTimeRecordingRepository extends BaseRepository {
-}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java
new file mode 100644
index 0000000..dda7e76
--- /dev/null
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-6-4 下午3:46
+ * @Modify:
+ **/
+public interface SysUserPasswordRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 499d89b..a489f69 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -26,13 +26,14 @@ public class CoreHqlPack {
/**
* In 参数封装
+ *
* @param columnName
* @return
*/
- public static String packHqlIds(String columnName, String[] params){
- StringBuffer result = new StringBuffer();
- HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
- HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+ public static String packHqlIds(String columnName, String[] params) {
+ StringBuffer result = new StringBuffer();
+ HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
HqlPack.getInPack(String.join(",", params), columnName, result);
return result.toString();
}
@@ -40,42 +41,45 @@ public class CoreHqlPack {
/**
* In 参数封装
+ *
* @param columnName
* @return
*/
- public static String packHqlIds(String columnName, Long[] params){
- StringBuffer result = new StringBuffer();
- HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
- HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+ public static String packHqlIds(String columnName, Long[] params) {
+ StringBuffer result = new StringBuffer();
+ HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
// 参数数组 [1,2,3] -> "1,2,3"
- HqlPack.getInPack(StringUtils.join(params,","),columnName,result);
+ HqlPack.getInPack(StringUtils.join(params, ","), columnName, result);
return result.toString();
}
/**
* In 参数封装
+ *
* @param columnName
* @return
*/
- public static DdlPackBean packHqlInStr(String columnName, String[] params){
+ public static DdlPackBean packHqlInStr(String columnName, String[] params) {
DdlPackBean ddlPackBean = new DdlPackBean();
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
return ddlPackBean;
}
/**
* In 参数封装
+ *
* @param columnName
* @return
*/
- public static DdlPackBean packHqlIn(String columnName, List params){
+ public static DdlPackBean packHqlIn(String columnName, List params) {
DdlPackBean ddlPackBean = new DdlPackBean();
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
return ddlPackBean;
}
@@ -83,24 +87,25 @@ public class CoreHqlPack {
/**
* 资源查询
+ *
* @param resource
* @return
*/
- public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource){
+ public static DdlPackBean packHqlSysLocaleResource(SysLocaleResource resource) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
- if(resource != null){
- DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
+ if (resource != null) {
+ DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result);
// 是否多类型查询
- if(StringUtils.isNotBlank(resource.getResourceTypes())){
+ if (StringUtils.isNotBlank(resource.getResourceTypes())) {
DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
}
- DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
- DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
- DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
- DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result);
- DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
+ DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result);
+ DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result);
+ DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(), "languageCode", result);
+ DdlPreparedPack.getStringLikerPack(resource.getResourceKey(), "resourceKey", result);
+ DdlPreparedPack.getStringLikerPack(resource.getResourceValue(), "resourceValue", result);
}
return result;
@@ -108,6 +113,7 @@ public class CoreHqlPack {
/**
* 语言
+ *
* @param localeLanguage
* @return
*/
@@ -118,9 +124,9 @@ public class CoreHqlPack {
// HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(),
// "createDateTime", result, false);
//字符串类型封装
- HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result);
+ HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(), "languageCode", result);
//字符串类型封装
- HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result);
+ HqlPack.getStringLikerPack(localeLanguage.getLanguageName(), "languageName", result);
// 添加默认排序
HqlPack.getOrderDefault(localeLanguage);
@@ -130,37 +136,39 @@ public class CoreHqlPack {
/**
* 岗位复杂查询
+ *
* @param position
* @return
*/
- public static DdlPackBean packHqlSysPosition(SysPosition position){
- return packHqlSysPosition(position,null);
+ public static DdlPackBean packHqlSysPosition(SysPosition position) {
+ return packHqlSysPosition(position, null);
}
- public static DdlPackBean packHqlSysPosition(SysPosition position,List idList){
+ public static DdlPackBean packHqlSysPosition(SysPosition position, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode());
// 查询参数封装
- DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
+ DdlPreparedPack.getNumEqualPack(position.getParentId(), "parentId", result);
// String Like
- DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+ DdlPreparedPack.getStringLikerPack(position.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(position.getPositionCode(), "positionCode", result);
// In
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
return result;
}
/**
* 岗位复杂查询
+ *
* @param position
* @return
*/
- public static DdlPackBean packHqlSysPositionList(SysPosition position){
+ public static DdlPackBean packHqlSysPositionList(SysPosition position) {
DdlPackBean result = DdlPackBean.getDdlPackBean(position);
// 查询参数封装
- DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
+ DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(), "organizeCode", result);
return result;
}
@@ -168,14 +176,15 @@ public class CoreHqlPack {
/**
* 岗位复杂查询
+ *
* @param bean
* @return
*/
- public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean){
+ public static DdlPackBean packHqlSysRefUserPosition(SysRefUserPosition bean) {
DdlPackBean result = DdlPackBean.getDdlPackBean(bean);
// 查询参数封装
- DdlPreparedPack.getNumEqualPack(bean.getUserId(),"userId",result);
+ DdlPreparedPack.getNumEqualPack(bean.getUserId(), "userId", result);
return result;
}
@@ -183,19 +192,20 @@ public class CoreHqlPack {
/**
* 组织复杂查询
+ *
* @param organize
* @return
*/
- public static String packHqlSysOrganize(SysOrganize organize){
+ public static String packHqlSysOrganize(SysOrganize organize) {
StringBuffer result = new StringBuffer();
// 查询参数封装
- if(organize.getChildIdList() != null){
- HqlPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result);
+ if (organize.getChildIdList() != null) {
+ HqlPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result);
}
- HqlPack.getStringLikerPack(organize.getName(),"name",result);
- HqlPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
+ HqlPack.getStringLikerPack(organize.getName(), "name", result);
+ HqlPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result);
// 添加默认排序
HqlPack.getOrderDefault(organize);
@@ -203,53 +213,54 @@ public class CoreHqlPack {
return result.toString();
}
- public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){
+ public static DdlPackBean packHqlSysOrganize(SysOrganize organize, List idList) {
HqlPack.getOrderDefault(organize);
DdlPackBean result = DdlPackBean.getDdlPackBean(organize);
- DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
- DdlPreparedPack.getNumEqualPack(organize.getParentId(),"parentId",result);
+ DdlPreparedPack.getStringLikerPack(organize.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(), "organizeCode", result);
+ DdlPreparedPack.getNumEqualPack(organize.getParentId(), "parentId", result);
// 查询参数封装
- if(organize.getChildIdList() != null){
- DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(),","),"parentId",result);
+ if (organize.getChildIdList() != null) {
+ DdlPreparedPack.getInPack(StringUtils.join(organize.getChildIdList(), ","), "parentId", result);
}
// Number In
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
return result;
}
- public static String packHqlSysOrganize(Long[] ids, Integer typeId){
+ public static String packHqlSysOrganize(Long[] ids, Integer typeId) {
StringBuffer result = new StringBuffer();
// 查询参数封装
- HqlPack.getInPack(StringUtils.join(ids,","),"id",result);
- HqlPack.getNumEqualPack(typeId,"organizeType",result);
+ HqlPack.getInPack(StringUtils.join(ids, ","), "id", result);
+ HqlPack.getNumEqualPack(typeId, "organizeType", result);
return result.toString();
}
/**
* 部门复杂查询
+ *
* @param department
* @return
*/
@Deprecated
- public static String packHqlSysDepartment(SysDepartment department){
+ public static String packHqlSysDepartment(SysDepartment department) {
StringBuffer result = new StringBuffer();
// if(department.getOrganizeId() != null && department.getOrganizeId() > 0){
// department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
// }
- HqlPack.getNumEqualPack(department.getParentId(),"parentId",result);
+ HqlPack.getNumEqualPack(department.getParentId(), "parentId", result);
// HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
- HqlPack.getStringLikerPack(department.getName(),"name",result);
- HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
+ HqlPack.getStringLikerPack(department.getName(), "name", result);
+ HqlPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result);
// 添加默认排序
HqlPack.getOrderDefault(department);
@@ -257,36 +268,36 @@ public class CoreHqlPack {
return result.toString();
}
- public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){
+ public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(department);
- DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
- DdlPreparedPack.getNumEqualPack(department.getParentId(),"parentId",result);
- DdlPreparedPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
- DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getStringLikerPack(department.getName(), "name", result);
+ DdlPreparedPack.getNumEqualPack(department.getParentId(), "parentId", result);
+ DdlPreparedPack.getNumEqualPack(department.getOrganizeId(), "organizeId", result);
+ DdlPreparedPack.getStringLikerPack(department.getDepartmentCode(), "departmentCode", result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
result.setOrderByStr(department.orderBy());
return result;
}
- public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){
+ public static DdlPackBean packDdlBeanSysMenu(SysMenu menu, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(menu);
- DdlPreparedPack.getInPackList(idList,"id",result);
- if(menu != null){
- DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
- DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
- DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
- DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
+ if (menu != null) {
+ DdlPreparedPack.getNumEqualPack(menu.getParentId(), "parentId", result);
+ DdlPreparedPack.getNumEqualPack(menu.getMenuType(), "menuType", result);
+ DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(), "menuStatus", result);
+ DdlPreparedPack.getStringLikerPack(menu.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(menu.getMenuCode(), "menuCode", result);
result.setOrderByStr(menu.orderBy());
- }else {
+ } else {
menu = new SysMenu();
}
- if(!StringUtils.isNotBlank(menu.getOrderByParam())){
+ if (!StringUtils.isNotBlank(menu.getOrderByParam())) {
menu.setOrderByParam("menuSort");
menu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
result.setOrderByStr(menu.orderBy());
@@ -297,16 +308,17 @@ public class CoreHqlPack {
/**
* 系统角色复杂查询
+ *
* @param role
* @return
*/
@Deprecated
- public static String packHqlSysRole(SysRole role){
+ public static String packHqlSysRole(SysRole role) {
StringBuffer result = new StringBuffer();
// 查询参数封装
- HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result);
- HqlPack.getStringLikerPack(role.getName(),"name",result);
+ HqlPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result);
+ HqlPack.getStringLikerPack(role.getName(), "name", result);
// 添加默认排序
HqlPack.getOrderDefault(role);
@@ -316,37 +328,53 @@ public class CoreHqlPack {
/**
* 系统角色复杂查询
+ *
+ * @param role
+ * @return
+ */
+ public static DdlPackBean packDdlBeanSysRole(SysRole role) {
+ return packDdlBeanSysRole(role, null);
+ }
+
+ /**
+ * 唯一校验
+ *
* @param role
* @return
*/
- public static DdlPackBean packDdlBeanSysRole(SysRole role){
- return packDdlBeanSysRole(role,null);
+ public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) {
+ DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+ DdlPreparedPack.getStringEqualPack(role.getName(), "name", result);
+ DdlPreparedPack.getNumEqualPack(role.getId(), "id", result);
+ return result;
}
- public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){
+ public static DdlPackBean packDdlBeanSysRole(SysRole role, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(role);
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
- DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result);
- DdlPreparedPack.getStringLikerPack(role.getName(),"name",result);
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
+ DdlPreparedPack.getNumEqualPack(role.getRoleStatus(), "roleStatus", result);
+ DdlPreparedPack.getStringLikerPack(role.getName(), "name", result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
- return result;
+ return result;
}
/**
* 系统参数复杂查询
+ *
* @param config
* @return
*/
- public static DdlPackBean packHqlSysConfig(SysConfig config) {
+ public static DdlPackBean packHqlSysConfig(SysConfig config) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接
- DdlPreparedPack.getStringLikerPack(config.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
- DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result);
+ DdlPreparedPack.getStringLikerPack(config.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(config.getConfigCode(), "configCode", result);
+ DdlPreparedPack.getNumEqualPack(config.getConfigType(), "configType", result);
DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result);
// 添加默认排序
@@ -357,6 +385,7 @@ public class CoreHqlPack {
/**
* 字典信息复杂查询
+ *
* @param dictionary
* @return
*/
@@ -368,7 +397,7 @@ public class CoreHqlPack {
DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result);
DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// 默认查询非顶级字典
- if (dictionary.getParentId() == null || dictionary.getParentId() < 1){
+ if (dictionary.getParentId() == null || dictionary.getParentId() < 1) {
DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
}
DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
@@ -385,6 +414,7 @@ public class CoreHqlPack {
/**
* 硬件类型复杂查询
+ *
* @param toolType
* @return
*/
@@ -392,7 +422,7 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// hql拼接
- HqlPack.getStringLikerPack(toolType.getName(),"name", result);
+ HqlPack.getStringLikerPack(toolType.getName(), "name", result);
// 添加默认排序
HqlPack.getOrderDefault(toolType);
@@ -402,6 +432,7 @@ public class CoreHqlPack {
/**
* 硬件复杂查询
+ *
* @param tool
* @return
*/
@@ -409,13 +440,13 @@ public class CoreHqlPack {
StringBuffer result = new StringBuffer();
// hql拼接
- HqlPack.getStringLikerPack(tool.getName(),"name",result);
- HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result);
- HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result);
- HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result);
- HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result);
- HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result);
- HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result);
+ HqlPack.getStringLikerPack(tool.getName(), "name", result);
+ HqlPack.getNumEqualPack(tool.getToolTypeId(), "toolTypeId", result);
+ HqlPack.getNumEqualPack(tool.getToolStatus(), "toolStatus", result);
+ HqlPack.getNumEqualPack(tool.getToolDataType(), "toolDataType", result);
+ HqlPack.getNumEqualPack(tool.getToolConnType(), "toolConnType", result);
+ HqlPack.getStringLikerPack(tool.getToolIp(), "toolIp", result);
+ HqlPack.getNumLikerPack(tool.getToolPort(), "toolPort", result);
// 添加默认排序
HqlPack.getOrderDefault(tool);
@@ -425,10 +456,11 @@ public class CoreHqlPack {
/**
* 消息复杂查询
+ *
* @param message
* @return
*/
- public static DdlPackBean packHqlSysMessage(SysMessage message){
+ public static DdlPackBean packHqlSysMessage(SysMessage message) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message);
// hql拼接
@@ -447,11 +479,12 @@ public class CoreHqlPack {
DdlPreparedPack.getOrderDefault(message);
- return ddlPackBean;
+ return ddlPackBean;
}
/**
* 文件资源复杂查询
+ *
* @param file
* @return
*/
@@ -466,11 +499,12 @@ public class CoreHqlPack {
DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result);
DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false);
- return result;
+ return result;
}
/**
* 任务周期复杂查询
+ *
* @param sysTaskCycle
* @return
*/
@@ -484,22 +518,23 @@ public class CoreHqlPack {
// 添加默认排序
HqlPack.getOrderDefault(sysTaskCycle);
- return result.toString();
+ return result.toString();
}
/**
* 定时任务复杂查询
+ *
* @param sysTaskPlan
* @return
*/
- public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){
+ public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接
- DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result);
- DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result);
- DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result);
+ DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(), "groupName", result);
+ DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(), "taskPlanStatus", result);
+ DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(), "taskCycleId", result);
DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result);
DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true);
@@ -507,57 +542,58 @@ public class CoreHqlPack {
// 添加默认排序
DdlPreparedPack.getOrderDefault(sysTaskPlan);
- return result;
+ return result;
}
/**
* 账号复杂查询
+ *
* @param user
* @return
*/
- public static String packHqlSysUser(SysUser user){
+ public static String packHqlSysUser(SysUser user) {
StringBuffer result = new StringBuffer();
// And X = X
- HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
- HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
- HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
- HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
- HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
-
- if(user.getRoleIdList() != null){
- HqlPack.getInPack(StringUtils.join(user.getRoleIdList(),","),"id",result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+ HqlPack.getNumEqualPack(user.getDepartmentId(), "departmentId", result);
+ HqlPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
+ HqlPack.getStringEqualPack(user.getOrganizeCode(), "organizeCode", result);
+
+ if (user.getRoleIdList() != null) {
+ HqlPack.getInPack(StringUtils.join(user.getRoleIdList(), ","), "id", result);
}
- if(user.getDepartmentIdList() != null){
- HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(),","),"id",result);
+ if (user.getDepartmentIdList() != null) {
+ HqlPack.getInPack(StringUtils.join(user.getDepartmentIdList(), ","), "id", result);
}
// And Like % %
- HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
- HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
- HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
- HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+ HqlPack.getStringLikerPack(user.getUserName(), "userName", result);
+ HqlPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
+ HqlPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
+ HqlPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
// 添加默认排序
HqlPack.getOrderDefault(user);
- return result.toString();
+ return result.toString();
}
- public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){
+ public static DdlPackBean packDdlBeanSysUser(SysUser user, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(user);
- DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+ DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
// DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
- DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
- DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
- DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
- DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+ DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
+ DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result);
+ DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
+ DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
// DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
result.setOrderByStr(user.orderBy());
return result;
@@ -565,52 +601,54 @@ public class CoreHqlPack {
/**
* 账号复杂查询
+ *
* @param user
* @return
*/
- public static DdlPackBean packDdlSysUser(SysUser user){
+ public static DdlPackBean packDdlSysUser(SysUser user) {
DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user);
// And X = X
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack);
- DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",ddlPack);
- DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",ddlPack);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", ddlPack);
+ DdlPreparedPack.getNumEqualPack(user.getDepartmentId(), "departmentId", ddlPack);
+ DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", ddlPack);
- if(user.getRoleIdList() != null){
- DdlPreparedPack.getInPack(user.getRoleIdList(),"id",ddlPack);
+ if (user.getRoleIdList() != null) {
+ DdlPreparedPack.getInPack(user.getRoleIdList(), "id", ddlPack);
}
- if(user.getDepartmentIdList() != null){
- DdlPreparedPack.getInPack(user.getDepartmentIdList(),"id",ddlPack);
+ if (user.getDepartmentIdList() != null) {
+ DdlPreparedPack.getInPack(user.getDepartmentIdList(), "id", ddlPack);
}
// And Like % %
- DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",ddlPack);
- DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",ddlPack);
- DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",ddlPack);
- DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",ddlPack);
+ DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", ddlPack);
+ DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", ddlPack);
+ DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", ddlPack);
+ DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", ddlPack);
// 添加默认排序
DdlPreparedPack.getOrderDefault(user);
DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, ddlPack);
- return ddlPack;
+ return ddlPack;
}
/**
* 查询字典代码是否重复
+ *
* @param dictionary
* @return
*/
- public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){
+ public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary) {
DdlPackBean result = new DdlPackBean();
// and
- DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
- DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
- DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
+ DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(), "dictionaryCode", result);
+ DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
+ DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// not
- DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+ DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result);
// 添加默认排序
DdlPreparedPack.getOrderDefault(dictionary);
@@ -620,18 +658,19 @@ public class CoreHqlPack {
/**
* 查询字典值是否重复
+ *
* @param dictionary
* @return
*/
- public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){
+ public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary) {
DdlPackBean result = new DdlPackBean();
// and
- DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
- DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
- DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
+ DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
+ DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
+ DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
// not
- DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result);
+ DdlPreparedPack.getNumNOEqualPack(dictionary.getId(), "id", result);
// 添加默认排序
DdlPreparedPack.getOrderDefault(dictionary);
@@ -641,92 +680,95 @@ public class CoreHqlPack {
/**
* 用户信息 复杂查询拼接
+ *
* @param userInfo
* @return
*/
- public static String packHqlSysUserInfo(SysUserInfo userInfo){
+ public static String packHqlSysUserInfo(SysUserInfo userInfo) {
StringBuffer result = new StringBuffer();
// And
- HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
- HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
// HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
// HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
- HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
- HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
- HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
+ HqlPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result);
+ HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result);
+ HqlPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result);
- if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){
+ if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) {
HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result);
}
// Like
- HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
- HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+ HqlPack.getStringLikerPack(userInfo.getName(), "name", result);
+ HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result);
// 添加默认排序
HqlPack.getOrderDefault(userInfo);
- return result.toString();
+ return result.toString();
}
- public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){
+ public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo, List idList) {
DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo);
// And
- DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
- DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
- DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
- DdlPreparedPack.getInPackList(idList,"id",result);
+ DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(), "positionId", result);
+ DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result);
+ DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(), "organizeCode", result);
+ DdlPreparedPack.getInPackList(idList, "id", result);
- if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){
- DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
+ if (userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()) {
+ DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(), "departmentId", result);
}
// Like
- DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+ DdlPreparedPack.getStringLikerPack(userInfo.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result);
// 添加默认排序
result.setOrderByStr(userInfo.orderBy());
- return result;
+ return result;
}
/**
* 用户信息 复杂查询拼接
+ *
* @param userInfo
* @return
*/
- public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){
+ public static String packHqlSysUserInfo(SysUserInfo userInfo, List idList) {
StringBuffer result = new StringBuffer();
// And
- HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
- if(idList != null && !idList.isEmpty()){
+ HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(), "userInfoStatus", result);
+ if (idList != null && !idList.isEmpty()) {
HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
}
// Like
- HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
- HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+ HqlPack.getStringLikerPack(userInfo.getName(), "name", result);
+ HqlPack.getStringLikerPack(userInfo.getUserEmpNo(), "userEmpNo", result);
// 添加默认排序
HqlPack.getOrderDefault(userInfo);
- return result.toString();
+ return result.toString();
}
/**
* 查询语言代码是否重复
+ *
* @param localeLanguage
* @return
*/
- public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){
+ public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage) {
StringBuffer result = new StringBuffer();
- HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result);
- HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result);
+ HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(), "languageCode", result);
+ HqlPack.getNumNOEqualPack(localeLanguage.getId(), "id", result);
// 添加默认排序
HqlPack.getOrderDefault(localeLanguage);
@@ -736,16 +778,17 @@ public class CoreHqlPack {
/**
* 检查系统资源是否重复
+ *
* @param localeResource
* @return
*/
- public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){
+ public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource) {
StringBuffer result = new StringBuffer();
- HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
- HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result);
- HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result);
- HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result);
+ HqlPack.getStringEqualPack(localeResource.getLanguageCode(), "languageCode", result);
+ HqlPack.getStringEqualPack(localeResource.getResourceKey(), "resourceKey", result);
+ HqlPack.getNumEqualPack(localeResource.getSoftType(), "softType", result);
+ HqlPack.getNumNOEqualPack(localeResource.getId(), "id", result);
// 添加默认排序
HqlPack.getOrderDefault(localeResource);
@@ -755,16 +798,17 @@ public class CoreHqlPack {
/**
* 查询规则代码是否重复
+ *
* @param orderNoRule
* @return
*/
- public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule){
+ public static String packHqlSysOrderNoRuleCode(SysOrderNoRule orderNoRule) {
StringBuffer result = new StringBuffer();
// and
- HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
+ HqlPack.getStringEqualPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result);
// not
- HqlPack.getNumNOEqualPack(orderNoRule.getId(),"id",result);
+ HqlPack.getNumNOEqualPack(orderNoRule.getId(), "id", result);
// 添加默认排序
HqlPack.getOrderDefault(orderNoRule);
@@ -773,19 +817,20 @@ public class CoreHqlPack {
}
/**
- * 单号规则复杂查询，分页，排序
+ * 单号规则复杂查询，分页，排序
+ *
* @param orderNoRule
* @return
*/
- public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){
+ public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
- DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result);
- DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
- DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result);
- DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result);
- DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result);
- DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result);
+ DdlPreparedPack.getStringLikerPack(orderNoRule.getName(), "name", result);
+ DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result);
+ DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(), "orderNoRuleStatus", result);
+ DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(), "organizeCode", result);
+ DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(), "orderNoRuleCode", result);
+ DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(), "orderNo", result);
if (orderNoRule.getSerialNo() != null) {
DdlPreparedPack.getNumEqualPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result);
}
@@ -798,19 +843,20 @@ public class CoreHqlPack {
/**
* 用户消息关系表负责查询
+ *
* @param sysRefUserMessage
* @return
*/
- public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){
- StringBuffer result = new StringBuffer();
+ public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage) {
+ StringBuffer result = new StringBuffer();
- HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result);
- HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result);
- HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result);
- HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
- HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result);
- HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result);
- HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result);
+ HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(), "messageTypeRdd", result);
+ HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(), "messageSoftType", result);
+ HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(), "messageTitleRdd", result);
+ HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(), "messageSenderNameRdd", result);
+ HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(), "messageStatus", result);
+ HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(), "receiverTime", result);
+ HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(), "receiverId", result);
// 添加默认排序
HqlPack.getOrderDefault(sysRefUserMessage);
@@ -820,44 +866,46 @@ public class CoreHqlPack {
/**
* 任务复杂查询
+ *
* @param sysTask
* @return
*/
- public static DdlPackBean packHqlSysTask(SysTask sysTask){
- DdlPackBean result = DdlPackBean.getDdlPackBean();
+ public static DdlPackBean packHqlSysTask(SysTask sysTask) {
+ DdlPackBean result = DdlPackBean.getDdlPackBean();
- DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result);
- DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result);
- DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result);
- DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result);
- DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result);
+ DdlPreparedPack.getStringLikerPack(sysTask.getName(), "name", result);
+ DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(), "organizeCode", result);
+ DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(), "taskSoftType", result);
+ DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(), "taskPackage", result);
+ DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(), "taskClass", result);
DdlPreparedPack.getOrderDefault(sysTask);
return result;
}
- public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){
- StringBuffer result = new StringBuffer();
+ public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids) {
+ StringBuffer result = new StringBuffer();
- HqlPack.getInPack(StringUtils.join(ids,","),"id",result);
- HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
+ HqlPack.getInPack(StringUtils.join(ids, ","), "id", result);
+ HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result);
return result.toString();
}
/**
* 大小区间比较
+ *
* @param columnName
* @param min
* @param max
* @return
*/
- public static String packHqlByInterval(String columnName,Object min,Object max){
- StringBuffer result = new StringBuffer();
+ public static String packHqlByInterval(String columnName, Object min, Object max) {
+ StringBuffer result = new StringBuffer();
- HqlPack.getNumSmallerPack(max,columnName,result);
- HqlPack.getNumBiggerPack(min,columnName,result);
+ HqlPack.getNumSmallerPack(max, columnName, result);
+ HqlPack.getNumBiggerPack(min, columnName, result);
return result.toString();
}
@@ -865,6 +913,7 @@ public class CoreHqlPack {
/**
* 字典信息查询id集合中是否存在默认数据
+ *
* @param ids
* @return
*/
@@ -872,44 +921,47 @@ public class CoreHqlPack {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// hql拼接
- DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result);
- DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result);
+ DdlPreparedPack.getInPack(StringUtils.join(ids, ","), "id", result);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isDefault", result);
return result;
}
/**
* 条码规则代码是否存在
+ *
* @param sysBarcodeRule
* @return
*/
- public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule){
- StringBuffer result = new StringBuffer();
+ public static String packHqlSysBarcodeRuleCode(SysBarcodeRule sysBarcodeRule) {
+ StringBuffer result = new StringBuffer();
// and
- HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+ HqlPack.getStringEqualPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result);
// not
- HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(),"id",result);
+ HqlPack.getNumNOEqualPack(sysBarcodeRule.getId(), "id", result);
return result.toString();
}
/**
* 条码规则复杂查询
+ *
* @param sysBarcodeRule
* @return
*/
- public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule){
- StringBuffer result = new StringBuffer();
+ public static String packHqlSysBarcodeRule(SysBarcodeRule sysBarcodeRule) {
+ StringBuffer result = new StringBuffer();
- HqlPack.getStringLikerPack(sysBarcodeRule.getName(),"name",result);
- HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(),"barcodeRuleCode",result);
+ HqlPack.getStringLikerPack(sysBarcodeRule.getName(), "name", result);
+ HqlPack.getStringLikerPack(sysBarcodeRule.getBarcodeRuleCode(), "barcodeRuleCode", result);
return result.toString();
}
/**
* 打印模板复杂查询
+ *
* @param sysLabelTemplate
* @return
*/
@@ -932,9 +984,9 @@ public class CoreHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate);
// hql拼接
- DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean);
- DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean);
- DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean);
+ DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean);
+ DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean);
+ DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(), "organizeCode", ddlPackBean);
DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true);
@@ -946,6 +998,7 @@ public class CoreHqlPack {
/**
* 打印模板参数复杂查询
+ *
* @param sysLabelTemplateParam
* @return
*/
@@ -965,98 +1018,102 @@ public class CoreHqlPack {
}
-
/**
* 文件代码是否存在
+ *
* @param sysFile 查询条件
* @return DdlPackBean
*/
- public static DdlPackBean packHqlSysFileCode(SysFile sysFile){
+ public static DdlPackBean packHqlSysFileCode(SysFile sysFile) {
DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile);
// and
- DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result);
+ DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(), "fileCode", result);
// not
- DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result);
+ DdlPreparedPack.getNumNOEqualPack(sysFile.getId(), "id", result);
return result;
}
- public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){
+ public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref) {
DdlPackBean result = DdlPackBean.getDdlPackBean(ref);
// Number Eq
- DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result);
+ DdlPreparedPack.getNumEqualPack(ref.getUserId(), "userId", result);
// String Eq
- DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result);
+ DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(), "organizeCode", result);
return result;
}
- public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){
+ public static DdlPackBean packDdlBeanSysRefUserRole(Long userId, Long roleId, String organizeCode) {
DdlPackBean result = DdlPackBean.getDdlPackBean();
// Number Eq
- DdlPreparedPack.getNumEqualPack(userId,"userId",result);
- DdlPreparedPack.getNumEqualPack(roleId,"roleId",result);
+ DdlPreparedPack.getNumEqualPack(userId, "userId", result);
+ DdlPreparedPack.getNumEqualPack(roleId, "roleId", result);
// String Eq
- DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+ DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
return result;
}
/**
* 查询当前用户所有组织数据
+ *
* @param sysRefUserDepartments
* @return
*/
- public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){
+ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
- DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean);
+ DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()), "id", packBean);
return packBean;
}
/**
* 按条件查询字典
+ *
* @param sysDictionary
* @return
*/
- public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){
+ public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(sysDictionary);
DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean);
DdlPreparedPack.getStringEqualPack(sysDictionary.getParentNameRdd(), "parentNameRdd", packBean);
- DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean);
+ DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(), "parentId", packBean);
DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean);
- DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean);
- DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(),"dictionaryValue",packBean);
+ DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(), "dictionaryGroup", packBean);
+ DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryValue(), "dictionaryValue", packBean);
return packBean;
}
/**
* 按条件查询字典
+ *
* @param bean
* @return
*/
- public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean){
+ public static DdlPackBean packHqlSysPojoVersion(SysPojoVersion bean) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean);
- DdlPreparedPack.getNumEqualPack(bean.getRefId(),"refId",packBean);
- DdlPreparedPack.getNumEqualPack(bean.getPlanId(),"planId",packBean);
- DdlPreparedPack.getNumEqualPack(bean.getOperateType(),"operateType",packBean);
- DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(),"refClass",packBean);
- DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(),"versionMethodName",packBean);
- DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(),"pojoCompare",packBean);
+ DdlPreparedPack.getNumEqualPack(bean.getRefId(), "refId", packBean);
+ DdlPreparedPack.getNumEqualPack(bean.getPlanId(), "planId", packBean);
+ DdlPreparedPack.getNumEqualPack(bean.getOperateType(), "operateType", packBean);
+ DdlPreparedPack.getStringLeftLikerPack(bean.getRefClass(), "refClass", packBean);
+ DdlPreparedPack.getStringLeftLikerPack(bean.getVersionMethodName(), "versionMethodName", packBean);
+ DdlPreparedPack.getStringLikerPack(bean.getPojoCompare(), "pojoCompare", packBean);
+ DdlPreparedPack.timeBuilder(bean.getModifyDatetime(), "modifyDatetime", packBean, false, true);
return packBean;
}
- public static DdlPackBean packSysDataSource(SysDataSource bean){
+ public static DdlPackBean packSysDataSource(SysDataSource bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getStringLikerPack(bean.getSourceHost(), "sourceHost", ddlPackBean);
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index fb44d00..102ab0e 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java
new file mode 100644
index 0000000..fbc0fe3
--- /dev/null
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "IF_PICK_DATA")
+@EqualsAndHashCode(callSuper = true)
+@Api("IF_拣货数据")
+public class IfPickData extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -1057633269490937118L;
+
+ @Column(name = "AREA_NO")
+ @ApiParam("区域代码")
+ private String areaNo;
+
+ @Column(name = "SECTION_NO")
+ @ApiParam("区段编号")
+ private String sectionNo;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料编号")
+ private String partNo;
+
+ @Column(name = "QTY")
+ @ApiParam("拣货数量")
+ private Integer qty;
+
+ @Column(name = "SYNC_FLAG")
+ @ApiParam("同步标识")
+ private Integer syncFlag;
+
+}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
index 1f9945f..633331e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
@@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
+ @ApiModelProperty("默认异常入库")
+ private boolean errorInsertFlag = true;
+
}
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java
new file mode 100644
index 0000000..0e84dc9
--- /dev/null
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/IfPickDataRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.IfPickData;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface IfPickDataRepository extends BaseRepository {
+
+}
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index dc4ea86..864c56a 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
index 5387dcd..6a9df34 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java
@@ -1,122 +1,122 @@
-package cn.estsh.i3plus.pojo.report.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-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 : Adair Peng
- * @CreateDate : 2019-01-18 11:32
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_POJO_ATTR")
-@Api(value="对象属性",description = "对象属性")
-public class BrPojoAttr extends BaseBean {
-
- private static final long serialVersionUID = -9025365832485707583L;
- @Column(name="TEMPLATE_ID")
- @ApiParam(value ="模板编号" ,example = "-1")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long templateId;
-
- @Column(name="SERVER_ID")
- @ApiParam(value ="服务ID",example = "-1")
- private Integer serverId;
-
- @Column(name="POJO_ID")
- @ApiParam(value ="模板对象ID" ,example = "-1")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long pojoId;
-
- @Column(name="POJO_NAME")
- @ApiParam(value ="对象名称")
- private String pojoName;
-
- @Column(name="PACKAGE_NAME_RDD")
- @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
- private String packageNameRdd;
-
- @Column(name="POJO_TABLE_NAME_ALIAS")
- @ApiParam(value ="对象别名")
- private String pojoTableNameAlias;
-
- @Column(name="ATTR_COLUMN_NAME")
- @ApiParam(value ="属性别名")
- private String attrColumnName;
-
- @Column(name="ATTR_COLUMN_NAME_ALIAS")
- @ApiParam(value ="属性别名")
- private String attrColumnNameAlias;
-
- @Column(name="PARENT_ID")
- @ApiParam(value ="上级ID",example = "-1")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long parentId;
-
- @Column(name="ATTR_TYPE")
- @ApiParam(value ="属性类型",example = "-1")
- private Integer attrType;
-
- @Column(name="ATTR_REF_TYPE")
- @ApiParam(value ="关系类型",example = "-1")
- private Integer attrRefType;
-
- @Column(name="DATA_TYPE")
- @ApiParam(value ="数据类型",example = "-1")
- private Integer dataType;
-
- @Column(name="CHART_ATTR_NAME")
- @ApiParam(value ="图标属性名称")
- private String chartAttrName;
-
- @Column(name="AGGREGATION_TYPE")
- @ApiParam(value ="聚合类型",example = "-1")
- private Integer aggregationType;
-
- @Column(name="AGGREGATION_ID")
- @ApiParam(value ="聚合类型",example = "-1")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long aggregationId;
-
- @Column(name="ATTR_SORT")
- @ApiParam(value ="字段排序")
- private Integer attrSort;
-
- @Column(name="ATTR_DATA_SORT")
- @ApiParam(value ="字段排序")
- private Integer attrDataSort;
-
- @Column(name="ATTR_STYLE")
- @ApiParam(value ="字段样式")
- private Integer attrStyle;
-
- @Column(name="ATTR_STYLE_RDD")
- @ApiParam(value ="字段样式")
- private String attrStyleRdd;
-
- @Column(name="ATTR_DEFAULT_VALUE")
- @ApiParam(value ="属性默认值")
- private String attrDefaultValue;
-
- @Column(name="ATTR_SHOW")
- @ApiParam(value ="属性是否显示",example = "-1")
- private Integer attrShow;
-
-}
+//package cn.estsh.i3plus.pojo.report.bean;
+//
+//import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+//import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+//import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+//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 : Adair Peng
+// * @CreateDate : 2019-01-18 11:32
+// * @Modify:
+// **/
+//@Data
+//@Entity
+//@DynamicInsert
+//@DynamicUpdate
+//@EqualsAndHashCode(callSuper = true)
+//@Table(name="BR_POJO_ATTR")
+//@Api(value="对象属性",description = "对象属性")
+//public class BrPojoAttr extends BaseBean {
+//
+// private static final long serialVersionUID = -9025365832485707583L;
+// @Column(name="TEMPLATE_ID")
+// @ApiParam(value ="模板编号" ,example = "-1")
+// @JsonSerialize(using = ToStringSerializer.class)
+// private Long templateId;
+//
+// @Column(name="SERVER_ID")
+// @ApiParam(value ="服务ID",example = "-1")
+// private Integer serverId;
+//
+// @Column(name="POJO_ID")
+// @ApiParam(value ="模板对象ID" ,example = "-1")
+// @JsonSerialize(using = ToStringSerializer.class)
+// private Long pojoId;
+//
+// @Column(name="POJO_NAME")
+// @ApiParam(value ="对象名称")
+// private String pojoName;
+//
+// @Column(name="PACKAGE_NAME_RDD")
+// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称")
+// private String packageNameRdd;
+//
+// @Column(name="POJO_TABLE_NAME_ALIAS")
+// @ApiParam(value ="对象别名")
+// private String pojoTableNameAlias;
+//
+// @Column(name="ATTR_COLUMN_NAME")
+// @ApiParam(value ="属性别名")
+// private String attrColumnName;
+//
+// @Column(name="ATTR_COLUMN_NAME_ALIAS")
+// @ApiParam(value ="属性别名")
+// private String attrColumnNameAlias;
+//
+// @Column(name="PARENT_ID")
+// @ApiParam(value ="上级ID",example = "-1")
+// @JsonSerialize(using = ToStringSerializer.class)
+// private Long parentId;
+//
+// @Column(name="ATTR_TYPE")
+// @ApiParam(value ="属性类型",example = "-1")
+// private Integer attrType;
+//
+// @Column(name="ATTR_REF_TYPE")
+// @ApiParam(value ="关系类型",example = "-1")
+// private Integer attrRefType;
+//
+// @Column(name="DATA_TYPE")
+// @ApiParam(value ="数据类型",example = "-1")
+// private Integer dataType;
+//
+// @Column(name="CHART_ATTR_NAME")
+// @ApiParam(value ="图标属性名称")
+// private String chartAttrName;
+//
+// @Column(name="AGGREGATION_TYPE")
+// @ApiParam(value ="聚合类型",example = "-1")
+// private Integer aggregationType;
+//
+// @Column(name="AGGREGATION_ID")
+// @ApiParam(value ="聚合类型",example = "-1")
+// @JsonSerialize(using = ToStringSerializer.class)
+// private Long aggregationId;
+//
+// @Column(name="ATTR_SORT")
+// @ApiParam(value ="字段排序")
+// private Integer attrSort;
+//
+// @Column(name="ATTR_DATA_SORT")
+// @ApiParam(value ="字段排序")
+// private Integer attrDataSort;
+//
+// @Column(name="ATTR_STYLE")
+// @ApiParam(value ="字段样式")
+// private Integer attrStyle;
+//
+// @Column(name="ATTR_STYLE_RDD")
+// @ApiParam(value ="字段样式")
+// private String attrStyleRdd;
+//
+// @Column(name="ATTR_DEFAULT_VALUE")
+// @ApiParam(value ="属性默认值")
+// private String attrDefaultValue;
+//
+// @Column(name="ATTR_SHOW")
+// @ApiParam(value ="属性是否显示",example = "-1")
+// private Integer attrShow;
+//
+//}
diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java
index 386bfc5..b719014 100644
--- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java
+++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java
@@ -1,15 +1,15 @@
-package cn.estsh.i3plus.pojo.report.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.report.bean.BrMenu;
-import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
-
-/**
- * @Description :
- * @Reference :
- * @Author : Adair Peng
- * @CreateDate : 2019-01-18 15:03
- * @Modify:
- **/
-public interface BrPojoAttrRepository extends BaseRepository {
-}
+//package cn.estsh.i3plus.pojo.report.repository;
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+//import cn.estsh.i3plus.pojo.report.bean.BrMenu;
+//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
+//
+///**
+// * @Description :
+// * @Reference :
+// * @Author : Adair Peng
+// * @CreateDate : 2019-01-18 15:03
+// * @Modify:
+// **/
+//public interface BrPojoAttrRepository extends BaseRepository {
+//}
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 8571a5f..e755225 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
index ab14d8d..f7fbfb9 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
@@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -10,6 +11,7 @@ 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;
@@ -38,19 +40,37 @@ public class BsSuitCaseFTP extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
- @Column(name = "file_Name")
+ @Column(name = "File_Name")
@ApiParam(value = "文件名")
private String fileName;
+ @Column(name = "FILE_ENCODE")
+ @ApiParam(value = "文件编码")
+ private Integer fileEncode;
+
+ @Column(name = "IS_TRANSFORM_MESSAGE")
+ @ApiParam(value = "是否转换报文")
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ private Integer isTransformMessage;
+
+ public int getIsTransformMessageVal() {
+ return isTransformMessage == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isTransformMessage;
+ }
+
+ public boolean isTransformMessage() {
+ return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsTransformMessageVal());
+ }
+
+
@Column(name = "ENCODE")
- @ApiParam(value = "编码")
+ @ApiParam(value = "ftp编码")
private Integer encode;
@Column(name = "IS_READ_AND_EMPTY")
@ApiParam(value = "读取并清空")
private Integer isReadAndEmpty;
- public boolean isReadAndEmpty(){
+ public boolean isReadAndEmpty() {
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty);
}
@@ -58,7 +78,7 @@ public class BsSuitCaseFTP extends BaseBean {
@ApiParam(value = "读取并删除")
private Integer isReadAndDelete;
- public boolean isReadAndDelete(){
+ public boolean isReadAndDelete() {
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete);
}
@@ -66,7 +86,7 @@ public class BsSuitCaseFTP extends BaseBean {
@ApiParam(value = "是否需要遍历")
private Integer isNeedTraversal;
- public boolean isNeedTraversal(){
+ public boolean isNeedTraversal() {
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal);
}
@@ -74,12 +94,24 @@ public class BsSuitCaseFTP extends BaseBean {
@ApiParam(value = "是否增量读取")
private Integer isIncrementalRead;
- public boolean isIncrementalRead(){
+ public boolean isIncrementalRead() {
return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead);
}
+ @Column(name = "IS_INCREMENTAL_WRITE")
+ @ApiParam(value = "是否增量写入")
+ private Integer isIncrementalWrite;
+
+ public int getIsIncrementalWriteVal(){
+ return isIncrementalWrite == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isIncrementalWrite;
+ }
+
+ public boolean isIncrementalWrite() {
+ return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal());
+ }
+
@Transient
- @ApiParam(value = "是否增量读取")
+ @ApiParam(value = "临时适配路径")
private String tempSuitFilePath;
@Transient
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index e36258d..194f0cb 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 9915420..60543fe 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-PROD-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
@@ -22,6 +22,20 @@
+
+
+
+ org.optaplanner
+ optaplanner-core
+ 7.36.0.Final
+
+
+
+ org.optaplanner
+ optaplanner-persistence-jpa
+ 7.36.0.Final
+
+
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
index 2e166b2..80ee2b6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java
@@ -117,4 +117,8 @@ public class AmpJisRec extends BaseBean {
this.qty = qty;
this.unit = unit;
}
+
+ public AmpJisRec() {
+
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
index c13b717..b816bfe 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java
@@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean {
@ApiParam(value = "产品报工orderNo")
private String fGOrderNo;
+ @Column(name = "SEQ_NO")
+ @ApiParam(value = "父位置号")
+ private String seqNo;
+
+ @Column(name = "ITEM_SEQ_NO")
+ @ApiParam(value = "子位置号")
+ private String itemSeqNo;
+
public SapDocFgSum(){}
public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
- String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) {
+ String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock,
+ String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) {
this.wdfdId = wdfdId;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean {
this.effStartTime = effStartTime;
this.bomVersion = bomVersion;
this.fGOrderNo = fGOrderNo;
+ this.seqNo = seqNo;
+ this.itemSeqNo = itemSeqNo;
}
public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 0600820..00036f6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -212,6 +212,17 @@ public class WmsASNMaster extends BaseBean {
this.recStatus = recStatus;
}
+ public WmsASNMaster(String orderNo, Integer asnStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+ this.orderNo = orderNo;
+ this.asnStatus = asnStatus;
+ this.organizeCode = organizeCode;
+ this.vendorNo = vendorNo;
+ this.dock = dockCode;
+ this.zdoc = zdoc;
+ this.createDatetime = createDateTime;
+ this.createDateTimeStart = receiveDateTime;
+ }
+
public int getAsnStatusVal() {
return this.asnStatus == null ? 0 : this.asnStatus;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java
new file mode 100644
index 0000000..3086942
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java
@@ -0,0 +1,106 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Index;
+import javax.persistence.Table;
+
+
+/**
+ * @Description : 北京海纳川任务明细
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2018-11-17 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_AUTO_FORK_CALL_BACK_DETAILS", indexes = {
+ @Index(columnList = "TASK_CODE")
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "无人叉车任务明细", description = "喜德无人叉车任务明细")
+public class WmsAutoForkCallBackDetails extends BaseBean {
+ private static final long serialVersionUID = -8103992000562208799L;
+
+ @Column(name = "REQ_CODE")
+ @ApiParam(value = "请求编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String reqCode;
+
+
+ @Column(name = "REQ_TIME")
+ @ApiParam(value = "请求时间")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String reqTime;
+
+ @Column(name = "CLIENT_CODE")
+ @ApiParam(value = "客服端编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String clientCode;
+
+ @Column(name = "TOKEN_CODE")
+ @ApiParam(value = "令牌号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tokenCode;
+
+ @Column(name = "INTERFACE_NAME")
+ @ApiParam(value = "接口名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String interfaceName;
+
+ @Column(name = "METHOD")
+ @ApiParam(value = "方法名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String method;
+
+ @Column(name = "TASK_CODE")
+ @ApiParam(value = "任务单号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String taskCode;
+
+ @Column(name = "WB_CODE")
+ @ApiParam(value = "工作为")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String wbCode;
+
+ @Column(name = "POD_CODE")
+ @ApiParam(value = "货架编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String podCode;
+
+ @Column(name = "CURRENT_POSITION_CODE")
+ @ApiParam(value = "子任务的位置编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String currentPositionCode;
+
+ @Column(name = "ROBOT_CODE")
+ @ApiParam(value = "执行任务的VGA编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String robotCode;
+
+ @Column(name = "STATUS", nullable = false, columnDefinition = "default 10")
+ @ApiParam("处理标准")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+ public Integer status;
+
+ @Column(name = "REMARK", nullable = false)
+ @ApiParam("备注")
+ public String remark;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java
new file mode 100644
index 0000000..e5fb349
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java
@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : 自动化策略明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-20 16:51
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_AUTO_STRATEGY_DETAIL", indexes = {
+ @Index(columnList = "AUTO_STRATEGY_NO"),
+ @Index(columnList = "STRATEGY_ITEM_NO")
+})
+@Api("自动化策略明细表")
+public class WmsAutoStrategyDetail extends BaseBean {
+ private static final long serialVersionUID = 6855278572650548519L;
+
+ @Column(name = "AUTO_STRATEGY_NO")
+ @ApiParam(value = "自动化策略编码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String autoStrategyNo;
+
+ @Column(name = "STRATEGY_ITEM_NO")
+ @ApiParam(value = "策略项编码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyItemNo;
+
+ @Column(name = "STRATEGY_ITEM_NAME")
+ @ApiParam(value = "策略项名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyItemName;
+
+ @Column(name = "STRATEGY_ITEM_SPEC")
+ @ApiParam(value = "策略项描述")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyItemSpec;
+
+ @Column(name = "FILTER_CONDITION")
+ @ApiParam(value = "过滤条件")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String filterCondition;
+
+ @Column(name = "SORT_CONDITION")
+ @ApiParam(value = "排序条件")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String sortCondition;
+
+ @Column(name = "STRATEGY_ACTION")
+ @ApiParam(value = "动作")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ @AnnoOutputColumn(refClass = WmsEnumUtil.STRATEGY_ACTION_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+ private Integer strategyAction;
+
+ @Column(name = "STRATEGY_METHOD")
+ @ApiParam(value = "方法")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyMethod;
+
+ @Column(name = "SCRIPT_NO")
+ @ApiParam(value = "脚本编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String scriptNo;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java
new file mode 100644
index 0000000..9a4437d
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMaster.java
@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Index;
+import javax.persistence.Table;
+
+
+/**
+ * @Description : 自动化策略主表
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-06-20 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_AUTO_STRATEGY_MASTER", indexes = {
+ @Index(columnList = "STRATEGY_NO"),
+ @Index(columnList = "ROUTING_CODE")
+})
+@Api("自动化策略主表")
+public class WmsAutoStrategyMaster extends BaseBean {
+ private static final long serialVersionUID = -1818481118386594571L;
+
+ @Column(name = "STRATEGY_NO")
+ @ApiParam(value = "策略编码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyNo;
+
+ @Column(name = "STRATEGY_NAME")
+ @ApiParam(value = "策略名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyName;
+
+ @Column(name = "STRATEGY_SPEC")
+ @ApiParam(value = "策略描述")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategySpec;
+
+ @Column(name = "STRATEGY_TYPE")
+ @ApiParam(value = "策略类型")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "OUT_MOVEMENT_MOVE_TYPE")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+ private Integer strategyType;
+
+ @Column(name = "ROUTING_CODE")
+ @ApiParam(value = "物料路线代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String routingCode;
+
+ @Column(name = "ROUTING_NAME")
+ @ApiParam(value = "物流路线名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String routingName;
+
+ @Column(name = "STRATEGY_QTY_CONTROL")
+ @ApiParam(value = "数量控制")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true)
+ private Integer strategyQtyControl;
+
+ @Column(name = "START_EFFECT_DATE")
+ @ApiParam(value = "开始生效时间")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String startEffectDate;
+
+ @Column(name = "END_EFFECT_DATE")
+ @ApiParam(value = "结束生效时间")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ public String endEffectDate;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java
new file mode 100644
index 0000000..31f0174
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java
@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description : 自动化策略方法
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-21 11:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_AUTO_STRATEGY_METHOD", indexes = {
+ @Index(columnList = "STRATEGY_ACTION")
+})
+@Api("自动化策略方法")
+public class WmsAutoStrategyMethod extends BaseBean {
+ private static final long serialVersionUID = -4424882984978962477L;
+
+ @Column(name = "STRATEGY_ACTION")
+ @ApiParam(value = "动作")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private Integer strategyAction;
+
+ @Column(name = "STRATEGY_METHOD")
+ @ApiParam(value = "策略方法")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategyMethod;
+
+ @Column(name = "STRATEGY_SPEC")
+ @ApiParam(value = "策略描述")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String strategySpec;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java
new file mode 100644
index 0000000..640c0d4
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java
@@ -0,0 +1,58 @@
+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 : jimmy.zeng
+ * @CreateDate : 2020-06-23 13:55
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_AUTO_TASK_LOG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "自动任务日志", description = "自动任务日志")
+public class WmsAutoTaskLog extends BaseBean {
+ private static final long serialVersionUID = -7839329617395574378L;
+
+ @Column(name = "ORDER_NO")
+ @ApiParam("关联订单号")
+ public String orderNo;
+
+ @Column(name = "BUSI_TYPE")
+ @ApiParam("业务类型")
+ public String busiType;
+
+ @Column(name = "STRATEGY_NO")
+ @ApiParam("策略代码")
+ public String strategyNo;
+
+ @Column(name = "STRATEGY_ACTION")
+ @ApiParam("策略动作")
+ public String strategyAction;
+
+ @Column(name = "OPERATE_TYPE")
+ @ApiParam("操作类型")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class)
+ public String operateType;
+
+ @Column(name = "ERROR_MSG")
+ @ApiParam("错误信息")
+ public String errorMsg;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.java
new file mode 100644
index 0000000..e07cb5f
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCoi.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;
+
+/**
+ * @Description : COI对照表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-09 16:59
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_COI")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="COI对照表",description = "COI对照表")
+public class WmsCoi extends BaseBean {
+
+ private static final long serialVersionUID = -8298385889006722335L;
+
+ @Column(name = "PART_NO")
+ @ApiParam(value = "物料编号")
+ private String partNo;
+
+ @Column(name = "PART_NAME")
+ @ApiParam(value = "物料名称")
+ private String partName;
+
+ @Column(name = "PART_VOL")
+ @ApiParam(value = "体积")
+ private Double partVol;
+
+ @Column(name = "TRUNROUND_RATE")
+ @ApiParam(value = "周转率")
+ private Double trunroundRate;
+
+ @Column(name = "COI_VALUE")
+ @ApiParam(value = "COI值")
+ private Double coiValue;
+
+ @Column(name = "LAST_UPDATE_DATE")
+ @ApiParam(value = "末次更新日期")
+ private String lastUpdateDate;
+
+ @Column(name = "FREQUENCY")
+ @ApiParam(value = "频次")
+ private Double frequency;
+
+ @Column(name = "LOCATE_NO")
+ @ApiParam(value = "库位")
+ private String locateNo;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
index 08e50e1..223cded 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@@ -153,4 +155,22 @@ public class WmsDocFgDetail extends BaseBean {
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
private String bomVersion;
+
+ @Column(name = "FIX_LOT_NO", nullable = false)
+ @ApiParam(value = "特殊批次")
+ private String fixLotNo = "";
+
+ @Column(name = "PACKAGE_NO")
+ @ApiParam(value = "包装编号")
+ private String packageNo;
+
+ @Column(name = "SEQ_NO")
+ @ApiParam(value = "父位置号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+ private String seqNo;
+
+ @Column(name = "ITEM_SEQ_NO")
+ @ApiParam(value = "子位置号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+ private String itemSeqNo;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index f149f30..80a7f60 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -232,6 +232,10 @@ public class WmsDocMovementDetails extends BaseBean {
private String seqNo;
@Transient
+ @ApiParam(value = "客户编号")
+ private String custNo;
+
+ @Transient
@ApiParam(value = "替代物料编码")
private String subPartNo;
@@ -421,4 +425,30 @@ public class WmsDocMovementDetails extends BaseBean {
this.planDate = poMasterDetails.getPlanDate();
this.planTime = poMasterDetails.getPlanTime();
}
+
+ public WmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails,Integer busiType,String srcZoneNo,String destZoneNo,
+ String custNo) {
+ this.orderNo = wmsDocMovementDetails.getOrderNo();
+ this.partNo = wmsDocMovementDetails.getPartNo();
+ this.qty = wmsDocMovementDetails.getQty();
+ this.taskGenerateQty = wmsDocMovementDetails.getTaskGenerateQty();
+ this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
+ this.unit = wmsDocMovementDetails.getUnit();
+ this.custNo = wmsDocMovementDetails.getCustNo();
+ this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
+ this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
+ this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
+ this.destWhNo = wmsDocMovementDetails.getDestWhNo();
+ this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
+ this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+ this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
+ this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
+ this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+ this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
+ this.busiType = busiType;
+ this.srcZoneNo = srcZoneNo;
+ this.destZoneNo = destZoneNo;
+ this.custNo = custNo;
+ }
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 9bba40c..2db18a2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -11,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* @Description : 移库单条码表
@@ -78,6 +82,14 @@ public class WmsDocMovementSn extends BaseBean {
@ApiParam(value = "供应商编码")
public String vendorNo;
+ @Column(name = "WORK_ORDER_CODE")
+ @ApiParam(value = "工单码")
+ private String workOrderCode;
+
+ @Column(name = "SEQ_NO")
+ @ApiParam(value = "父位置号")
+ private String seqNo;
+
@Column(name = "SN_TYPE")
@ApiParam(value = "条码类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 0876d86..640dca1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -109,6 +109,7 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
@Column(name = "STATUS")
@ApiParam(value = "库位状态", example = "-1")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_STATUS.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "LOCATE_STATUS")
private Integer status;
@@ -165,6 +166,26 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer bhLocateType;
+ @Column(name = "DOWN_X")
+ @ApiParam(value = "X向下偏移", example = "-1")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+ private Integer downX;
+
+ @Column(name = "UP_X")
+ @ApiParam(value = "X向上偏移", example = "-1")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+ private Integer upX;
+
+ @Column(name = "DOWN_Y")
+ @ApiParam(value = "Y向下偏移", example = "-1")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+ private Integer downY;
+
+ @Column(name = "UP_Y")
+ @ApiParam(value = "Y向上偏移", example = "-1")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.DOWN_OR_UP.class, refForeignKey = "value", value = "description")
+ private Integer upY;
+
// 导入用
@ApiParam(value = "工厂")
@Transient
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 6c182e1..1a11e38 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
@@ -340,7 +340,7 @@ public class WmsMoveSn extends BaseBean {
}
public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn,
- String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
+ String outPartNo,String rcPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty,
String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) {
this.id = id;
this.organizeCode = organizeCode;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index 1f57cde..e639538 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -212,6 +212,10 @@ public class WmsMoveToERP extends BaseBean {
@Transient
private Long finishedCounts;
+ @Column(name = "POD_DIR")
+ @ApiParam(value = "方向")
+ private Integer podDir;
+
@Transient
private Long shippingId;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index e18d087..1dcc9ff 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -171,6 +171,21 @@ public class WmsPOMaster extends BaseBean {
@Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
public String zdoc;
+ public WmsPOMaster() {
+
+ }
+
+ public WmsPOMaster(String orderNo, Integer poStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+ this.orderNo = orderNo;
+ this.poStatus = poStatus;
+ this.organizeCode = organizeCode;
+ this.vendorNo = vendorNo;
+ this.dock = dockCode;
+ this.zdoc = zdoc;
+ this.createDatetime = createDateTime;
+ this.createDateTimeStart = receiveDateTime;
+ }
+
public int getPoStatusVal() {
return this.poStatus == null ? 0 : this.poStatus;
}
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
index 702df84..1d9ed2e 100644
--- 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
@@ -47,7 +47,7 @@ public class WmsPackageSpec extends BaseBean {
@Column(name = "PARENT_SPEC")
@ApiParam(value = "上级规格")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
- isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode")
+ isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specCode")
private String parentSpec;
@Column(name = "SPEC_LEVEL")
@@ -64,12 +64,16 @@ public class WmsPackageSpec extends BaseBean {
@Column(name = "POCKET_TYPE")
@ApiParam(value = "容器类型")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
- dataSrc = "/wms/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode")
+ dataSrc = "/wms/base-data/wms-container-type/query", listColumnName = "ctName", explicitColumnName = "ctCode")
private String pocketType;
@ApiParam(value = "上级规格名称")
@Column(name = "PARENT_NAME")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
- isRequire = 2, dataSrc = "/wms/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName")
+ isRequire = 2, dataSrc = "/wms/base-data/wms-package-spec/query", listColumnName = "specName", explicitColumnName = "specName")
private String parentName;
+
+ @Column(name = "DIRECTION")
+ @ApiParam(value = "方向")
+ private Integer direction;
}
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 235fd54..1878152 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
@@ -226,6 +226,11 @@ public class WmsPart extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;
+ @Column(name = "PART_VOL", columnDefinition = "decimal(18,8)")
+ @ApiParam(value = "体积", example = "1")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+ private Double partVol;
+
@Transient
@ApiParam("总数量")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
@@ -290,6 +295,11 @@ public class WmsPart extends BaseBean {
public WmsPart() {
}
+ public Double getPartVol() {
+ return partVol == null ? 0 : partVol;
+ }
+
+
public Double getQty() {
return qty == null ? 0 : qty;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
index 892ea6e..4bf40f2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
/**
* @Description :物流线路规则表
@@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目的单据条码状态")
private Integer destMoveSnStatus;
+ @Column(name = "FILTER_SCRIPT_NO", length = 50)
+ @ApiParam(value = "过滤条件")
+ private String filterScriptNo;
+
public WmsRoutingRule(){}
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
index 8ee1297..117d091 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
@@ -89,6 +89,11 @@ public class WmsSerialSn extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
+ @Column(name = "PACKAGE_NO")
+ @ApiParam(value = "包装编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String packageNo;
+
public WmsSerialSn() {
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 3b790fb..5ad3da6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -745,7 +745,7 @@ public class WmsStockSn extends BaseBean {
String shippingFlag, String workCenterCode, Integer snType,
String packagePartNo, Integer useCount, Integer seqNo,
String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
- String prodCfgTypeName, String custNameRdd) {
+ String prodCfgTypeName, String custNameRdd, String workOrderCode) {
this.organizeCode = organizeCode;
this.id = id;
this.sn = sn;
@@ -791,7 +791,7 @@ public class WmsStockSn extends BaseBean {
this.partTypeDesc = partTypeDesc;
this.prodCfgTypeName = prodCfgTypeName;
this.custNameRdd = custNameRdd;
- this.vendorNameRdd = vendorNameRdd;
+ this.workOrderCode = workOrderCode;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index be8dd7d..99716c7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -9,8 +9,13 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.math.BigDecimal;
+import java.util.List;
/**
* @Description : 作业任务明细信息
@@ -140,6 +145,11 @@ public class WmsTaskDetails extends BaseBean {
@ApiParam("交易类型")
public String transTypeCodeRdd;
+ @Transient
+ @ApiParam("工厂代码集合")
+ private List organizeCodeList;
+
+
public Double getQty() {
return this.qty == null ? 0 : this.qty;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java
new file mode 100644
index 0000000..96ed7f1
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java
@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 策略表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-09 16:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_TRACTICS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="策略表",description = "策略表")
+public class WmsTractics extends BaseBean {
+
+ private static final long serialVersionUID = -8203200560604263871L;
+ @Column(name="TRACTICS_CODE")
+ @ApiParam(value ="策略代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tracticsCode;
+
+ @Column(name="TRACTICS_NAME")
+ @ApiParam(value ="策略名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tracticsName;
+
+ @Column(name="TRACTICS_DESC")
+ @ApiParam(value ="策略描述")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tracticsDesc;
+
+ @Column(name="TRACTICS_GRADE")
+ @ApiParam(value ="策略等级")
+ // @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GRADE.class, refForeignKey = "value", value = "description")
+// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GRADE")
+ private Integer tracticsGrade;
+
+ @Column(name="TRACTICS_GROUP")
+ @ApiParam(value ="策略组")
+// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "TRACTICS_GROUP")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRACTICS_GROUP.class, refForeignKey = "value", value = "description")
+ private Integer tracticsGroup;
+
+ @Column(name="TRACTICS_ITEM")
+ @ApiParam(value ="策略项")
+// @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Integer tracticsItem;
+
+ @Column(name="TRACTICS_PART_GROUP")
+ @ApiParam(value ="策略适用物料组")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+ dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
+ searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo")
+ private String tracticsPartGroup;
+
+ @Column(name="TRACTICS_ZONE")
+ @ApiParam(value ="策略适用存储区")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+ searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
+ private String tracticsZone;
+
+ @Column(name="TRACTICS_PARAM")
+ @ApiParam(value ="参数")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tracticsParam;
+
+ @Column(name="TRACTICS_START_TIME")
+ @ApiParam(value ="策略生效日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+ private String tracticsStartTime;
+
+ @Column(name="TRACTICS_END_TIME")
+ @ApiParam(value ="策略失效日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
+ private String tracticsEndTime;
+
+ @Column(name="LEV1_STRATEGY")
+ @ApiParam(value ="1级策略上架")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
+ private Integer lev1Strategy;
+
+// @Column(name="LEV1_STRATEGY")
+ @Transient
+ @ApiParam(value ="1级策略拣货")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
+ private Integer lev1StrategyPicking;
+
+ @Column(name="LEV2_STRATEGY")
+ @ApiParam(value ="2级策略")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
+ private Integer lev2Strategy;
+
+ @Column(name="LEV3_STRATEGY")
+ @ApiParam(value ="3级策略")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
+ private Integer lev3Strategy;
+
+// public String getIev1StrategyPicking (String lev1StrategyPicking) {
+// return this.lev1Strategy = lev1StrategyPicking;
+// }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
index a20ea25..2c5f6e1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
@@ -77,6 +77,10 @@ public class WmsTransType extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
private Integer orderBackType;
+ @Column(name = "TM_NAME")
+ @ApiParam(value = "交易处理组件名称")
+ private String tmName;
+
@Transient
@ApiParam("菜单URL")
private String menuUrl;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java
new file mode 100644
index 0000000..9fcf1fc
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 自动过滤物流路线
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-07-01
+ * @Modify:
+ **/
+@Data
+@Api("自动过滤物流路线")
+public class WmsAutoFilterRoutingRuleModel {
+
+ @ApiParam("工厂代码")
+ private String organizeCode;
+
+ @ApiParam("料架车")
+ private String parentSpec;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
new file mode 100644
index 0000000..6b5d6b9
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-22 18:59
+ * @Modify:
+ **/
+@Data
+public class WmsAutoTaskModel {
+
+ @ApiParam("业务类型")
+ private Integer busiType;
+
+ @ApiParam("存储区")
+ private String zoneNo;
+
+ @ApiParam("单据号")
+ private String orderNo;
+
+ @ApiParam("物料集合")
+ private List partList;
+
+ @ApiParam("工厂代码")
+ private String organizeCode;
+
+ @ApiParam("交易类型")
+ private String transTypeCode;
+
+ @ApiParam("锁定库位")
+ private String lockLocacte;
+
+ @ApiParam("锁定源库位")
+ private String srcLockLocacte;
+
+ @ApiParam("方向")
+ private Integer direction;
+
+ @ApiParam("货格")
+ private String packageNo;
+
+ @ApiParam("锁定料车")
+ private String lockCar;
+
+ @ApiParam("预存锁定料车")
+ private String prestoreLockCar;
+
+ @ApiParam("物料对应的单据明细集合")
+ private Map partNoDetailsList;
+
+ @ApiParam("锁定物料对应的条码")
+ private Map> partNoGroupListMap;
+
+ @ApiParam("锁定条码")
+ private List lockStockSnList;
+
+ @ApiParam("动作日志记录")
+ private WmsAutoTaskLog wmsAutoTaskLog;
+
+ @ApiParam("任务生成数量")
+ private Double taskQty;
+
+ @ApiParam("返回错误信息")
+ public String errorMsg;
+
+ @ApiParam("策略代码")
+ public String strategyNo;
+
+ @ApiParam("策略动作")
+ public String strategyAction;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java
new file mode 100644
index 0000000..6e8535f
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStrategyModel.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsTractics;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-15 13:21
+ * @Modify:
+ **/
+@Data
+@Api("策略返回model")
+public class WmsStrategyModel {
+
+ @ApiParam(value = "物料编号")
+ private String partNo;
+
+ @ApiParam(value = "数量")
+ private Double qty;
+
+ @ApiParam(value = "工厂代码")
+ private String organizeCode;
+
+ @ApiParam("策略对象")
+ public WmsTractics wmsTractics;
+
+ @ApiParam("List结果集")
+ public List