From e14e813230a1320b943a97f8673ae9546ffa5c02 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Jan 2020 13:36:23 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=907476=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E8=80=81=E6=A0=87=E7=AD=BE=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8c32ae6..fd72780 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1294,6 +1294,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); if (wmsStockSn.getIsValid() != null) { From e1225bbccdc0f269e8a15ac40e9abb4aae01d420 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 21 Jan 2020 15:01:29 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=BB=84=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 50 ---------------------- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 1 + .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 + .../pojo/aps/converter/CustomDateDeserializer.java | 11 +++-- .../i3plus/pojo/aps/model/RuleGroupProgress.java | 16 +++++++ 10 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java deleted file mode 100644 index 122226c..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.bean; - -import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description :BOM树 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@EqualsAndHashCode(callSuper = true) -@Api("BOM树") -@ExcludeImportExport -public class BomTree extends BaseAPS { - - @ApiParam(value ="物料类型") - private ApsEnumUtil.MATERIAL_TYPE type; - - @ApiParam(value ="备料类型") - private ApsEnumUtil.PREPARE_TYPE prepareType; - - @ApiParam(value ="补充类型") - private ApsEnumUtil.REPLENISHMENT_TYPE replType; - - @ApiParam(value ="采购提前期") - private String purchaseLeadTime; - - @ApiParam(value ="制造提前期") - private String manufLeadTime; - - @ApiParam(value ="配送提前期") - private String shipmentLeadTime; - - @ApiParam(value ="单位采购量") - private Integer unitPurchase; - - @ApiParam(value ="单位制造量") - private Integer unitManuf; - - @ApiParam(value ="单位配送量") - private Integer unitShipment; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 1c3c598..4199073 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule { @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; } 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 ca8b7f2..7c7c313 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 @@ -139,6 +139,7 @@ public class Material extends BaseAPS { @Column(name="ORDER_BATCH_PERIOD") @ApiParam(value ="订单合并期间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String orderBatchPeriod; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 4743f7d..37548d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -74,6 +74,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index bbf7a04..b6687d9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 963ff6f..515cd7b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -60,10 +60,12 @@ public class Resource extends BaseAPS { @Column(name="PREV_BUFFER") @ApiParam(value ="前缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevBuffer; @Column(name="POST_BUFFER") @ApiParam(value ="后缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postBuffer; @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)") @@ -80,14 +82,17 @@ public class Resource extends BaseAPS { @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="ROUND_TYPE") @@ -117,6 +122,7 @@ public class Resource extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String lockTime; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 9c126d1..85b3191 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS { @ApiParam(value ="序号") private Integer orderNumber; + @ApiParam(value ="当前执行的规则序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的规则名称") + private transient String curDetailName; + @JsonBackReference public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } 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 0dae95e..d973fb4 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 20863b2..35cc4ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; +import org.springframework.util.StringUtils; import java.io.IOException; import java.text.ParseException; @@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer { @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { - try { - return DATETIME_FORMATOR.parse(jsonParser.getText()); - } catch (ParseException e) { - e.printStackTrace(); + String text = jsonParser.getText(); + if (!StringUtils.isEmpty(text)) { + try { + return DATETIME_FORMATOR.parse(text); + } catch (ParseException e) { + } } return null; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java new file mode 100644 index 0000000..c6e4ba3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * @Description : 进度条显示信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-01-21 + * @Modify: + **/ +@Data +public class RuleGroupProgress { + private String message; + private String progress; +} From 54cd3cfc45540a57602c6138771d3903ec49fe74 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 21 Jan 2020 15:32:53 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 8 ++++++-- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 15 ++++++++------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 8 ++++++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 7 +++++-- .../i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java | 9 ++++++--- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 10 +++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 7 +++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 +++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 +++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 +++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 10 +++++++--- 19 files changed, 94 insertions(+), 52 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index b5e57f6..116abff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -62,7 +62,7 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE") + @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index b912f5c..6c1beda 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -22,11 +22,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) + } +) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 0684e76..863a6fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -9,10 +9,7 @@ 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,20 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) + } +) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index bb13a85..bb60da6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -24,11 +24,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 6c7b997..472f846 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -27,14 +27,15 @@ import java.io.Serializable; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})} + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) + } ) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index e93c938..c8dcab7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -25,11 +25,14 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 1af12f5..a266608 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -25,15 +25,18 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a4d542..f2162b2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8065877030194822855L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 4d63bfa..8382b3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -23,12 +23,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("客户信息") public class MesCustOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 4990079075654538033L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("订单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 5de7a4a..8c1b09f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -27,12 +27,14 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO"}) }) @Api("设备作业任务") public class MesEquTask extends BaseBean implements Serializable { private static final long serialVersionUID = -3351277499164455197L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 43dfa07..e164c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -27,16 +27,18 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO", "EQUIPMENT_CODE"}) }) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 3317290109159353376L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; - @Column(name = "EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE", nullable = false) @ApiParam("设备代码") private String equipmentCode; 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 94a9281..79fe8cb 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 @@ -22,11 +22,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +}) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index de95f5d..5c44dcd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -9,10 +9,7 @@ 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; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 955791a..01be425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -24,11 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6773005820598583458L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; 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 81f7d5e..9f84b79 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 @@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -33,11 +30,14 @@ import java.io.Serializable; @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"}) }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6984193022328810942L; - @Column(name = "SERIAL_NUMBER") + // 联合唯一索引必须加:, nullable = false + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") private String serialNumber; @@ -65,7 +65,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件号") private String itemPartNo; - @Column(name = "KP_SN") + @Column(name = "KP_SN", nullable = false) @ApiParam("原材料条码") private String kpSn; 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 7619062..c0f20d1 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 @@ -29,12 +29,13 @@ import java.math.BigDecimal; @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = -1630924042562178494L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 81604e5..8b8a70c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -29,11 +29,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) }) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452106180601417L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; 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 dff413d..589f92e 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 @@ -25,15 +25,17 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 7840873844253353896L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; 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 1e50789..30d074e 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 @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; From 44648e4218d0d0c13244f42c34d1a2e6382e4e48 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Jan 2020 17:45:17 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=901396=20=E4=BA=9A=E5=A4=AA-?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 5 +++ 2 files changed, 43 insertions(+) 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 e789365..c8c1bab 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 @@ -4945,4 +4945,42 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 领料看板执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_EXECUTE_STATUS { + IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + + private int value; + private String description; + + PICKING_EXECUTE_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) { + return valueOf(val); + } + } } \ No newline at end of file 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 379fd9d..4493f44 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 @@ -218,6 +218,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "汇总拣货数量", example = "0") public Double sumPickQty; + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 4583b87bf5615f2678dedf378f18749bad54fe51 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 09:13:51 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index b8563c0..8183437 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 7d8f02d..6cc2b67 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } From 03de37cf7cf82f66ce79b1358b94fe8c292f3b63 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 10:41:03 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index c6e4ba3..6a67f59 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -12,5 +12,5 @@ import lombok.Data; @Data public class RuleGroupProgress { private String message; - private String progress; + private Long progress; } From 4ccda480614a4d060240d15ba5435824d32db199 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 22 Jan 2020 15:20:47 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=90=20PDA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=90=8E?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8F=90=E7=A4=BA=E7=9A=84=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E3=80=91=E3=80=90bug7409=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java index c6d2d19..3f75a3f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,6 +18,7 @@ public class WmsLogInfoSendToMqModel implements Serializable { private int handleType; @ApiParam("日志对象DAO层") private String baseRepository; + @JsonDeserialize(as = WmsActionLogData.class) @ApiParam("日志对象（新增）") private BaseBean logBean; @ApiParam("查询条件名称（修改）") From 591f865bf385f3ebc07f08b21cc413908fcd7eb6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 3 Feb 2020 17:21:36 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90=E6=88=90=E5=93=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E9=9C=80=E8=A6=81=E5=B8=A6=E5=87=BA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=85=88=E7=94=A8=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=80=E5=B1=9E=E7=9A=84=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E5=BE=80=E5=9C=B0+=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8E=BBWMS=5FCU?= =?UTF-8?q?STOMER=5FPART=E8=A1=A8=E4=B8=AD=E6=89=BE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=86=8D=E7=94=A8=E5=AE=A2=E6=88=B7+?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8E=BB=E6=89=BE=E3=80=82=E3=80=91?= =?UTF-8?q?=E3=80=90bug7501=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 d812406..aa9a3fe 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 @@ -118,4 +118,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; + + @Transient + @ApiParam("客户零件号") + private String customerPartNo; } From e1114d67d2e693a6ed538a6bc8e0a502407cf0c5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 5 Feb 2020 10:24:09 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E8=A7=A3=E5=86=BB=E8=B0=83=E5=B7=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8B=BE=E9=80=89=E4=BA=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=80=E4=B8=AA=E5=8D=95=E5=AD=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E5=AD=90=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E6=89=80=E6=9C=89=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=B7=AE=E8=8C=83=E5=9B=B4=E9=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=80=A7=E8=B0=83=E5=B7=AE=E6=89=80=E6=9C=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91=E3=80=90bug7485=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsCSOrderMasterModel.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 4 files changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index 9330c69..c492ccd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange; import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("盘点订单主表") public List wmsCSOrderMasterList; + @ApiParam("盘点调差表") + public List wmsCSAdjustRangeList; + @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index a8c2c3b..5b08a41 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -110,4 +110,29 @@ public class QadBop implements Serializable { @Column(name="CREATE_DATE_TIME") @ApiParam("创建时间") public String createDateTime; + + @Transient + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Transient + @ApiParam("工厂代码") + public String inSite; + + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { + this.bopCode = bopCode; + this.bopDesc = bopDesc; + this.bopDomain = bopDomain; + this.parentPart = parentPart; + this.parentReturnPart = parentReturnPart; + this.bopdwQty = bopdwQty; + this.subBopCode = subBopCode; + this.subBopPart = subBopPart; + this.subItemPart = subItemPart; + this.subQty = subQty; + this.subUnit = subUnit; + this.createDateTime = createDateTime; + this.inAddr = inAddr; + this.inSite = inSite; + } } 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 aa9a3fe..81cd4b4 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 @@ -122,4 +122,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("客户零件号") private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 06afc0f..6c78826 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "特殊批次") private String fixLotNo = ""; + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ From 96e0e3756fff2c2d723d0b2fd0ef3417d0468fcb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 6 Feb 2020 14:33:29 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90=207507=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E6=94=B6=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E3=80=91bug7507?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 1 file changed, 5 insertions(+) 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 4493f44..dce4072 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 @@ -151,6 +151,11 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) + @ApiParam("源单行号") + public String srcItem; + @Transient @ApiParam("实际批次") private String actualLot; From 9c754e581659d0c07ddd3692e91f37eb39504265 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 7 Feb 2020 14:08:28 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90=20=E5=8F=91=E8=BF=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=2020300=EF=BC=8C=2020390=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=BE=80=20ref=5Fitem=20=E5=AD=97=E6=AE=B5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E3=80=91=E3=80=90bug7506?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 5b08a41..24eb89b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -119,6 +119,10 @@ public class QadBop implements Serializable { @ApiParam("工厂代码") public String inSite; + public QadBop(){ + + } + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { this.bopCode = bopCode; this.bopDesc = bopDesc;