From e340749f872698679ffb6baef87608f895ad5d9e Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Jun 2020 17:06:41 +0800 Subject: [PATCH 1/7] Finish Task #2196 Cost:4h --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 904d9b3..482019c 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 @@ -727,7 +727,9 @@ public class WmsEnumUtil { EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"), LOADING_ORDER(530, "LOADING_ORDER", "装车单"), SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"), - FORK_INSTORE(550, "FORK_INSTORE", "采购入库"); + FORK_INSTORE(550, "FORK_INSTORE", "采购入库"), + CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"), + CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库"); private int value; private String code; private String description; 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..90713b3 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,12 @@ 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; } From f90371f63281557ec0196dbf2585c070914d4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sun, 21 Jun 2020 14:26:25 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=902144=2006=201.2.4.6.1.3=20?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E8=AE=A1=E5=88=92=E6=8E=92=E4=BA=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cc97315..e992adc 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 @@ -1905,7 +1905,8 @@ public class MesEnumUtil { MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"), - MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"); + MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"), + MES_WORK_ORDER_PAINT_ZS(460, "planZSOrderExcelService", "生产工单-注塑"); private int value; private String service; 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..141f713 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,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "VIN_CODE") @ApiParam("vin") private String vinCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; } 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 d09d54d..a83b4a0 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 @@ -272,6 +272,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; } From 6c5c7261876d7eb5d918ac55978b0f52ace55f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 21 Jun 2020 14:56:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?REST=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8=E6=94=AF=E6=8C=81JSON=E4=B8=8EXML=20FTP=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A2=9E=E9=87=8F=E5=86=99=E5=85=A5=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90=E5=86=85=E5=AD=98?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 aa9bd67..f3cb0ae 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 @@ -98,6 +98,18 @@ public class BsSuitCaseFTP extends BaseBean { 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 = "临时适配路径") private String tempSuitFilePath; From 26b564f0bed9da5fb753aeea67bbe97856611cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sun, 21 Jun 2020 16:33:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?FTP=20=E6=96=87=E4=BB=B6=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3cb0ae..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 @@ -46,7 +46,7 @@ public class BsSuitCaseFTP extends BaseBean { @Column(name = "FILE_ENCODE") @ApiParam(value = "文件编码") - private String fileEncode; + private Integer fileEncode; @Column(name = "IS_TRANSFORM_MESSAGE") @ApiParam(value = "是否转换报文") From 3d889133434c3948931ba5938831f6c4d8e7d6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sun, 21 Jun 2020 16:40:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86=E5=8C=85=E8=A7=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++++ 1 file changed, 4 insertions(+) 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 e2b4a01..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; From e94e4ad189ebd62c29373540429342847802c2ff Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 21 Jun 2020 17:26:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=902180=2006=201.2.3.8=E6=B3=B0?= =?UTF-8?q?=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=91=20=E3=80=902181=2006=201.2.3.8=20?= =?UTF-8?q?=E6=B3=B0=E5=9B=BDWMS-=E5=AE=B9=E5=99=A8=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E6=8E=A5=E5=8F=A3=E3=80=91=20=E3=80=902180?= =?UTF-8?q?=2006=201.2.3.8=E6=B3=B0=E5=9B=BDWMS=EF=BC=8D=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 82 +++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsJobParamModel.java | 1 + .../pojo/wms/bean/WmsAutoStrategyDetail.java | 86 ++++++++++++++++++++++ .../pojo/wms/bean/WmsAutoStrategyMethod.java | 51 +++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 +++ .../cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java | 5 ++ .../WmsAutoStrategyDetailRepository.java | 16 ++++ .../WmsAutoStrategyMasterRepository.java | 16 ++++ .../WmsAutoStrategyMethodRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 60 +++++++++++++++ 10 files changed, 345 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoStrategyMethod.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 482019c..98df4b4 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 @@ -8115,4 +8115,86 @@ public class WmsEnumUtil { return description; } } + + /** + * 动作类型 + * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 80-取消任务、90-递进交换 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STRATEGY_ACTION_TYPE { + LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), + UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), + LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), + UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), + LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + 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; + } + } } 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-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/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/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 08e50e1..48fcef0 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,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String fixLotNo = ""; } 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/repository/WmsAutoStrategyDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java new file mode 100644 index 0000000..4806018 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoStrategyDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java new file mode 100644 index 0000000..d6200d8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMasterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoStrategyMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 自动化策略主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:34 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java new file mode 100644 index 0000000..fba9918 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAutoStrategyMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoStrategyMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-06-21 11:51 + * @Modify: + **/ +@Repository +public interface WmsAutoStrategyMethodRepository extends BaseRepository { +} 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 667156b..d88c8fd 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 @@ -3407,4 +3407,64 @@ public class WmsHqlPack { getStringBuilderPack(wmsSerialSnTrans, packBean);*/ return packBean; } + + /** + * 自动化策略主表 分页查询 + * + * @param wmsAutoStrategyMaster + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMaster(WmsAutoStrategyMaster wmsAutoStrategyMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyNo(), "strategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyMaster.getStrategyName(), "strategyName", result); + DdlPreparedPack.getNumEqualPack(wmsAutoStrategyMaster.getStrategyType(), "strategyType", result); + DdlPreparedPack.getStringEqualPack(wmsAutoStrategyMaster.getRoutingCode(), "routingCode", result); + if (StringUtils.isNotBlank(wmsAutoStrategyMaster.getStartEffectDate()) && StringUtils.isNotBlank(wmsAutoStrategyMaster.getEndEffectDate())) { + result.setWhereAppend(result.getWhereAppend() + " and (startEffectDate >= '"+wmsAutoStrategyMaster.getStartEffectDate()+"' and endEffectDate <= '"+wmsAutoStrategyMaster.getEndEffectDate()+"' )"); + } + + getStringBuilderPack(wmsAutoStrategyMaster, result); + + return result; + } + + /** + * 自动化策略明细表 分页查询 + * + * @param wmsAutoStrategyDetail + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyDetail(WmsAutoStrategyDetail wmsAutoStrategyDetail) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getAutoStrategyNo(), "autoStrategyNo", result); + DdlPreparedPack.getStringLikerPack(wmsAutoStrategyDetail.getStrategyItemNo(), "strategyItemNo", result); + + getStringBuilderPack(wmsAutoStrategyDetail, result); + + return result; + } + + /** + * 自动化策略方法 分页查询 + * + * @param WmsAutoStrategyMethod + * @return + */ + public static DdlPackBean packHqlWmsAutoStrategyMethod(WmsAutoStrategyMethod WmsAutoStrategyMethod) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(WmsAutoStrategyMethod.getStrategyAction(), "strategyAction", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategyMethod(), "strategyMethod", result); + DdlPreparedPack.getStringLikerPack(WmsAutoStrategyMethod.getStrategySpec(), "strategySpec", result); + + getStringBuilderPack(WmsAutoStrategyMethod, result); + + return result; + } } From 9567d62195c250a0507ab64676b4cff66bdc1551 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 21 Jun 2020 17:39:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=8C=96?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 46 ++++++++++++++++++++++ .../pojo/wms/bean/WmsAutoStrategyMaster.java | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 98df4b4..c22fa26 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 @@ -8197,4 +8197,50 @@ public class WmsEnumUtil { 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; + } + } } 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 index ca598b0..9a4437d 100644 --- 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 @@ -72,7 +72,7 @@ public class WmsAutoStrategyMaster extends BaseBean { @Column(name = "STRATEGY_QTY_CONTROL") @ApiParam(value = "数量控制") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "SHIPP_QTY_CONTROL") - @AnnoOutputColumn(refClass = WmsEnumUtil.SHIPP_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.AUTO_STRATEGY_QTY_CONTROL.class, refForeignKey = "value", value = "description", hidden = true) private Integer strategyQtyControl; @Column(name = "START_EFFECT_DATE")