From 482159b322a95894fefc43be17db45ac9b0582df Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 4 Sep 2019 10:26:15 +0800 Subject: [PATCH 01/63] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 5148235..7ebba6f 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 @@ -18,8 +18,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_PCN_TASK_STATUS { - OPEN(1, "OPEN"), - CLOSE(2, "CLOSE"); + OPEN(1, "开启"), + CLOSE(2, "关闭"); private int value; private String description; From 0faeaa60479bedf77864c83f7ae991400c7aaafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 11:06:18 +0800 Subject: [PATCH 02/63] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 90f380b..34efda9 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 @@ -1,6 +1,8 @@ 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; @@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; @Column(name="REMARK") @@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean { @Column(name="SRC_QC_STATUS") @ApiParam(value = "源质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") public Integer srcQcStatus; @Column(name="SRC_SN_STATUS") @ApiParam(value = "源条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer srcSnStatus; @Column(name="DEST_QC_STATUS") @ApiParam(value = "目的质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") public Integer descQcStatus; @Column(name="DEST_SN_STATUS") @ApiParam(value = "目的条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer destSnStatus; @Column(name="DATE_CODE") From 254f08da3242a988ae0ed414929ca61503736ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Sep 2019 14:03:25 +0800 Subject: [PATCH 03/63] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b2e283c..1c1dbdc 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 @@ -92,7 +92,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") - @ApiParam(value = "收货检验否", example = "1") + @ApiParam(value = "是否免检", example = "1") private Integer iqc; @Column(name = "MIN") From 836f1bf8701fff6c07314dbca5e21314753344bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 14:53:53 +0800 Subject: [PATCH 04/63] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 61fb891..a54f0ac 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -3,6 +3,7 @@ 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 com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -158,11 +159,11 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("父物料编码") - private String fPartNo; + private String fpartNo; @Transient @ApiParam("父物料名称") - private String fPartName; + private String fpartName; @Transient @ApiParam("数量") @@ -172,6 +173,16 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("创建时间") private String createDateTime; + /* @JSONField(name="fPartNo") + public String getfPartNo() { + return fPartNo; + } + + @JSONField(name="fPartName") + public String getfPartName() { + return fPartName; + }*/ + public WmsMoveDetails(){} public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){ @@ -203,8 +214,8 @@ public class WmsMoveDetails extends BaseBean { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workCenterCode = workCenterCode; - this.fPartNo = fPartNo; - this.fPartName = fPartName; + this.fpartNo = fPartNo; + this.fpartName = fPartName; this.unit = unit; this.qty = qty; this.createDateTime = createDateTime; From 01cb76da6df01ceba99ce134e02eed81c77ee5c3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Sep 2019 14:55:52 +0800 Subject: [PATCH 05/63] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=A7=BB=E5=BA=93=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=9B=AE=E6=A0=87=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 16a7ce9..af7f9f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -95,6 +95,11 @@ public class WmsZones extends BaseBean { this.zoneNo = zoneNo; } + public WmsZones(String zoneNo,String areaNo){ + this.zoneNo = zoneNo; + this.areaNo = areaNo; + } + public WmsZones(){} } From d8568e6d220584a9ce123939983ce4b66fa7f763 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Sep 2019 15:01:57 +0800 Subject: [PATCH 06/63] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=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/wms/sqlpack/WmsHqlPack.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4f0ca46..8ab7676 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 @@ -1305,6 +1305,10 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); getStringBuilderPack(wmsCSOrderDetails, result); @@ -1323,6 +1327,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); getStringBuilderPack(wmsCSFactTrans, result); From ff462900b79d1dc026e4e05eeb337a54d1e1f4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 15:24:49 +0800 Subject: [PATCH 07/63] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 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 d710147..d895cf1 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 @@ -586,6 +586,16 @@ public class WmsEnumUtil { } 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; + } } @@ -903,6 +913,16 @@ public class WmsEnumUtil { 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -953,6 +973,16 @@ public class WmsEnumUtil { 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { @@ -1166,6 +1196,16 @@ public class WmsEnumUtil { } 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; + } } /** From 876571e877a5978201fae0e2bcd2db8769616985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Sep 2019 16:06:42 +0800 Subject: [PATCH 08/63] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A994=EF=BC=9BBU?= =?UTF-8?q?G=EF=BC=9A5498?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 52 ++++++++++++---------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 42 +++++++++-------- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 50c04d5..27f4a5a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 产品发运信息 @@ -26,94 +27,99 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_SHIPPING") +@Table(name = "WMS_DOC_SHIPPING") @Api("产品发运信息") public class WmsShipping extends BaseBean { private static final long serialVersionUID = 5760351204320621363L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("发运单号") public String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY") + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; /** * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "10") public Integer orderStatus; - @Column(name="REMARK") + @Transient + @ApiParam(value = "状态") + public List orderStatusList; + + @Column(name = "REMARK") @ApiParam("备注") public String remark; - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="CUST_NO") + @Column(name = "CUST_NO") @ApiParam("客户编码") public String custNo; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG") @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME") @ApiParam("发运时间") public String shippingTime; @Transient - @ApiParam(value ="客户简称") + @ApiParam(value = "客户简称") private String custName; @Transient @ApiParam(value = "发往地简称") private String flagName; - @Column(name="AREA_NO") + @Column(name = "AREA_NO") @ApiParam("ERP库存地") public String areaNo; - @Column(name="CAR_NO") + @Column(name = "CAR_NO") @ApiParam("车号") public String carNo; - @Column(name="ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE") @ApiParam("错误信息") public String errorMessage; - @Column(name="IS_LOCK") - @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + @Column(name = "IS_LOCK") + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定") public Integer isLock; - @Column(name="ERP_SYNC_FLAG") - @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + @Column(name = "ERP_SYNC_FLAG") + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败") public Integer erpSyncFlag; - public WmsShipping(){} + public WmsShipping() { + } - public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) { + public WmsShipping(Long id, Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit, String areaNo) { this.id = id; this.partNo = partNo; this.partNameRdd = partNameRdd; 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 4f0ca46..2693ed1 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 @@ -45,19 +45,18 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); - if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } return hqlStr; } /** - * * @param wmsFix * @return */ - public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){ + public static DdlPackBean packHqlWmsFix(WmsFix wmsFix) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -77,9 +76,10 @@ public class WmsHqlPack { /** * 单位换算 分页查询 + * * @return */ - public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -175,11 +175,12 @@ public class WmsHqlPack { /** * 移库单号集合查询条件封装 + * * @param orderNoList * @param organizeCode * @return */ - public static DdlPackBean packWmsDocMovementMasterByOrderNos(List orderNoList,String organizeCode) { + public static DdlPackBean packWmsDocMovementMasterByOrderNos(List orderNoList, String organizeCode) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getInPack(orderNoList, "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); @@ -616,6 +617,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsShipping.getSn(), "sn", result); //发运状态 DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); + //发运状态集合 + DdlPreparedPack.getInPackList(wmsShipping.getOrderStatusList(), "orderStatus", result); //特殊发货标志 DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); //单据来源 @@ -2067,7 +2070,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ - DdlPreparedPack.getOrderColConvertType("item",CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); + DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); getStringBuilderPack(wmsCSRange, result); return result; @@ -2240,19 +2243,19 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); // 库位不为空 - DdlPreparedPack.getStringNotNullPack( "locateNo", result); - DdlPreparedPack.getStringNoEqualPack("","locateNo", result); + DdlPreparedPack.getStringNotNullPack("locateNo", result); + DdlPreparedPack.getStringNoEqualPack("", "locateNo", result); // 排除创建及出库状态条码 - if(wmsStockSn.getSnStatus() != null){ + if (wmsStockSn.getSnStatus() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); } - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); - DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result); - DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); //数量大于0 - DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getNumberBiggerPack(0, "qty", result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); @@ -2282,13 +2285,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); - if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") - || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "") + || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) { DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true); } - if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") - || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ + if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) { DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); } @@ -2332,9 +2335,10 @@ public class WmsHqlPack { /** * 单位换算 分页查询 + * * @return */ - public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){ + public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize) { DdlPackBean result = new DdlPackBean(); //查询参数封装 From 65cb39d7bacf416349cda7b6afc5d4698308a496 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 4 Sep 2019 16:10:54 +0800 Subject: [PATCH 09/63] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 9eab2c7..a4ffab8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -41,7 +41,7 @@ public class MesPcn extends BaseBean { @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") - private String workCentreCode; + private String workCenterCode; @Column(name="PCN_VERSION") @ApiParam("PCN版本") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 1f5b45c..96bd806 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -41,7 +41,7 @@ public class MesPcn extends BaseBean { @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") - private String workCentreCode; + private String workCenterCode; @Column(name="PCN_VERSION") @ApiParam("PCN版本") From 4852a4754c4886bf13bb6b455f6a60544073e2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 16:11:47 +0800 Subject: [PATCH 10/63] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=80=BC=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index a54f0ac..292d6ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -151,6 +151,7 @@ public class WmsMoveDetails extends BaseBean { @Transient @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") private Integer busiTypeCode; @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 34efda9..e0b1590 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 @@ -164,9 +164,9 @@ public class WmsMoveSn extends BaseBean { @Transient @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") private Integer busiTypeCode; - @Transient @ApiParam(value = "交易类型代码") private String transTypeCode; From c05b22668f842bb0fac2f30c08ae294be66f54a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 19:08:57 +0800 Subject: [PATCH 11/63] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 05347ae..40a2930 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -146,6 +146,28 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, + String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent=isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.partNo = partNo; + this.itemStatus = itemStatus; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.refSrc = refSrc; + this.organizeCode =organizeCode; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + } + public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) { this.id = id; From 7ce78b170fa34ee9dcfd706f74d89e474cc1828f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 4 Sep 2019 19:22:47 +0800 Subject: [PATCH 12/63] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7ebba6f..f2a4690 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 @@ -881,15 +881,17 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STEP_PARAM_TYPE { - QUALIFIED(10, "数字"), - DEFECTED(20, "字符串"), - SCRAPED(30, "可选值"); + QUALIFIED(10,"number", "数字"), + DEFECTED(20, "text","字符串"), + SCRAPED(30,"select", "可选值"); private int value; + private String code; private String description; - STEP_PARAM_TYPE(int value, String description) { + STEP_PARAM_TYPE(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -897,6 +899,8 @@ public class MesEnumUtil { return value; } + public String getCode(){return code;} + public String getDescription() { return description; } From 1332f11a238e6ddac9a93b980cfbd7021e31dec8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 4 Sep 2019 23:02:25 +0800 Subject: [PATCH 13/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 8 ++++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 14 ++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java index b444b59..f1cae75 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -53,11 +53,11 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value ="同步时间") private String syncTime; - @Column(name="SYNC_PATTERN")//2、新增 1、修改 + @Column(name="SYNC_PATTERN")//2.新增 1.修改 @ApiParam("同步方式") private Integer syncPattern; - @Column(name="SYNC_TYPE")//1\pcn获取mes数据 2、pcn推送数据至mes + @Column(name="SYNC_TYPE")//1.pcn获取mes数据 2.pcn推送数据至mes @ApiParam("同步类型") private Integer syncType; @@ -66,6 +66,10 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value ="上一同步时间") private String lastSyncTime; + @Column(name="EXTRACT_GAP") + @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") + private Integer extractGap; + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 6991141..5a2d40c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -66,6 +66,11 @@ public class MesPcnSyncCfg extends BaseBean { @ApiParam(value ="上一同步时间") private String lastSyncTime; + + @Column(name="EXTRACT_GAP") + @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制") + private Integer extractGap; + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } 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 3f16e63..19ce394 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 @@ -265,13 +265,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); - } - + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); return packBean; } @@ -513,6 +508,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); return packBean; } + public static DdlPackBean getMesEventByEventName(MesEvent mesEvent) { DdlPackBean packBean = getAllBaseData(mesEvent.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesEvent.getEventName(), "eventName", packBean); @@ -525,6 +521,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean); return packBean; } + public static DdlPackBean getMesActionByActionName(MesAction mesAction, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode); DdlPreparedPack.getStringEqualPack(mesAction.getActionName(), "actionName", packBean); @@ -557,7 +554,6 @@ public class MesHqlPack { * 函数分页获取封装 * * @param mesMethod - * @param organizeCode * @return */ public static DdlPackBean getMesMethod(MesMethod mesMethod) { @@ -574,6 +570,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean); return packBean; } + public static DdlPackBean getMesMethodByMethodName(MesMethod mesMethod) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, mesMethod.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesMethod.getMethodName(), "methodName", packBean); @@ -1173,6 +1170,7 @@ public class MesHqlPack { /** * 条码生成规则校验同一机构下条码规则唯一性 + * * @param numberRule * @param id * @param organizeCode From e4cf6780002fc0c59080aca2da182981ed73f882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 5 Sep 2019 10:40:13 +0800 Subject: [PATCH 14/63] =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=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/wms/bean/WmsMoveMaster.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 40a2930..5beaff5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -148,7 +148,7 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, - String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) { + String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId) { this.orderNo = orderNo; this.orderStatus = orderStatus; this.remark = remark; @@ -166,6 +166,7 @@ public class WmsMoveMaster extends BaseBean { this.createUser = createUser; this.modifyDatetime =modifyDatetime; this.modifyUser =modifyUser; + this.fixId = fixId; } public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, From 575aa6ea2f58761424743595cc8a82402887939e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 5 Sep 2019 10:41:50 +0800 Subject: [PATCH 15/63] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E8=A1=A8=20=E6=B7=BB=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 +++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 292d6ee..249bed2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -229,7 +229,7 @@ public class WmsMoveDetails extends BaseBean { ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, - String createUser,String createDatetime){ + String createUser,String createDatetime,String modifyDatetime,String modifyUser){ this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -253,5 +253,7 @@ public class WmsMoveDetails extends BaseBean { this.busiTypeCode = busiTypeCode; this.createUser = createUser; this.createDatetime = createDatetime; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 40a2930..692685b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -169,7 +169,8 @@ public class WmsMoveMaster extends BaseBean { } public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc, + String createDatetime,String createUser,String modifyDatetime,String modifyUser) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -188,5 +189,9 @@ public class WmsMoveMaster extends BaseBean { this.fixId = fixId; this.busiTypeCode = busiTypeCode; this.refSrc = refSrc; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; } } 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 e0b1590..5f423a0 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 @@ -214,10 +214,11 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } + public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, - String createUser,String createDatetime){ + String createUser,String createDatetime,String modifyDatetime,String modifyUser){ this.organizeCode=organizeCode; this.orderNo=orderNo; this.item=item; @@ -245,5 +246,7 @@ public class WmsMoveSn extends BaseBean { this.sn = sn; this.createUser = createUser; this.createDatetime = createDatetime; -} + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + } } From d2995520d467fac7e4373748bc2af78daf807fd9 Mon Sep 17 00:00:00 2001 From: wangjie Date: Thu, 5 Sep 2019 13:16:57 +0800 Subject: [PATCH 16/63] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=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/pcn/bean/MesPcnTask.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 5120404..63ea2de 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务状态") private Integer taskStatus; + @Column(name="TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } 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 cacfdc0..432e829 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 @@ -81,6 +81,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务状态") private Integer taskStatus; + @Column(name="TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } From 64aed1f49ce2a4f132bf87915d286779ed950b33 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 5 Sep 2019 13:46:29 +0800 Subject: [PATCH 17/63] =?UTF-8?q?=E5=BC=80=E5=8F=91=20Restful=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95PDA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d895cf1..47a9c86 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Method; import java.util.ArrayList; @@ -774,7 +775,7 @@ public class WmsEnumUtil { return null; } else { for (int i = 0; i < values().length; i++) { - if (values()[i].value == value) { + if (StringUtils.equalsIgnoreCase(values()[i].value,value)) { return values()[i]; } } From 61ed3d821d484aca68f9c6ee5092dcbe92d36917 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 5 Sep 2019 13:49:35 +0800 Subject: [PATCH 18/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=200905?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java index 9e8b522..f1512b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesActionMethodModel.java @@ -31,6 +31,9 @@ public class MesActionMethodModel implements Serializable { @ApiParam("函数代码") private String methodCode; + @ApiParam("函数代码") + private String methodName; + @ApiParam("序号") private Integer seq; From a12a00871369e4311919a387120c1904dd60a567 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 5 Sep 2019 16:13:13 +0800 Subject: [PATCH 19/63] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80f32e6..e448ccb 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 @@ -2073,7 +2073,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result); - DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ From a59f95080c47670cd58654acb45447d6b8d2ff4f Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 5 Sep 2019 16:33:06 +0800 Subject: [PATCH 20/63] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95-=E5=90=8C=E6=AD=A5=E5=AF=B9=E8=B1=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=8A=A8=E6=80=81=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 8466ff9..43874a3 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -79,6 +79,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_EXPORT") + @ApiParam(value = "是否导出") + private Integer isObjectExport; + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) From 09aab6d87a377fb0d7c3fae506c01a8668aa10ba Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 5 Sep 2019 21:05:43 +0800 Subject: [PATCH 21/63] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E5=A4=9A=E4=B8=AA=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index a6bc5f9..3753061 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -112,6 +112,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; + @Transient + @ApiParam("存储区编号") + public String[] zoneNos; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 9c929a5..3748bd7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -116,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("源单位") public String srcUnit; + @Transient + @ApiParam("存储区编号") + public String[] zoneNos; + /** * 差异类型：10：盘平，20：盘亏，30盘赢 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index e16c3bd..dac3089 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 盘点范围信息 @@ -57,6 +58,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("单位") public String unit; + @Transient + @ApiParam("存储区编号") + public String[] zoneNos; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ 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 e448ccb..ced5ed7 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 @@ -1310,7 +1310,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); getStringBuilderPack(wmsCSOrderDetails, result); @@ -1331,7 +1331,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); getStringBuilderPack(wmsCSFactTrans, result); @@ -2074,7 +2074,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getInPackArray(wmsCSRange.getZoneNos(), "zoneNo", result); DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{ DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result); From fe455a7147d00a835b9c82698f971c679e5ca8a3 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 6 Sep 2019 10:46:01 +0800 Subject: [PATCH 22/63] =?UTF-8?q?pcn=E7=A6=BB=E7=BA=BF=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index 684fe5e..9b659f9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -37,6 +37,10 @@ public class MesPcnSysUserOffline extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long userId; + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + @Column(name = "USER_NAME") @ApiParam(value = "用户名称", access = "账号名称") private String userName; From 8ac4f214b3f2981e451dfb486ad28ba567304820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 6 Sep 2019 14:00:58 +0800 Subject: [PATCH 23/63] #5596 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 249bed2..85fd21b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -229,7 +229,7 @@ public class WmsMoveDetails extends BaseBean { ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, - String createUser,String createDatetime,String modifyDatetime,String modifyUser){ + String createUser,String createDatetime,String modifyUser,String modifyDatetime){ this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index af511fe..64c423c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -171,7 +171,7 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc, - String createDatetime,String createUser,String modifyDatetime,String modifyUser) { + String createDatetime,String createUser,String modifyUser,String modifyDatetime) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -192,7 +192,7 @@ public class WmsMoveMaster extends BaseBean { this.refSrc = refSrc; this.createDatetime= createDatetime; this.createUser = createUser; - this.modifyDatetime =modifyDatetime; this.modifyUser =modifyUser; + this.modifyDatetime =modifyDatetime; } } From f0fba5e23a4acc1404dc7adffe3fc0532925e544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 6 Sep 2019 14:35:29 +0800 Subject: [PATCH 24/63] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0--excel=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 70 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 3 + .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 6 ++ .../i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 8 +++ 4 files changed, 87 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 47a9c86..53a9315 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 @@ -871,6 +871,16 @@ public class WmsEnumUtil { } 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; + } } @@ -1043,6 +1053,15 @@ public class WmsEnumUtil { } 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; + } } /** @@ -1088,6 +1107,16 @@ public class WmsEnumUtil { } 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; + } } /** @@ -1126,6 +1155,16 @@ public class WmsEnumUtil { } 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; + } } /** @@ -1566,6 +1605,7 @@ public class WmsEnumUtil { public String getDescription() { return description; } + } /** @@ -2700,6 +2740,16 @@ public class WmsEnumUtil { } 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; + } } @@ -2985,6 +3035,16 @@ public class WmsEnumUtil { } 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; + } } /** @@ -3307,6 +3367,16 @@ public class WmsEnumUtil { 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 int descOf(String desc) { int tmp = 1; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 3753061..8c51e62 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -1,6 +1,8 @@ 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; @@ -78,6 +80,7 @@ public class WmsCSFactTrans extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 3748bd7..b583ee5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -1,6 +1,8 @@ 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; @@ -78,6 +80,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") public Integer qcStatus; /** @@ -87,6 +90,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; /** @@ -94,6 +98,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description") public Integer transStatus; @Transient @@ -125,6 +130,7 @@ public class WmsCSOrderDetails extends BaseBean { */ @Transient @ApiParam("差异类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; public Double getQty() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index cc70d2e..0354924 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -1,6 +1,8 @@ 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; @@ -41,10 +43,12 @@ public class WmsCSOrderMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "单据类型", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description") public Integer orderType; @Column(name = "ORDER_STATUS") @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer orderStatus; @Column(name = "ACTION_PERSENT") @@ -57,14 +61,17 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_INVENTORY") @ApiParam(value = "是否允许清点", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isInventory; @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @Column(name = "IS_PART") @ApiParam(value = "是否散件") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isPart; @Column(name = "YEAR") @@ -73,6 +80,7 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_SYNC_ERP") @ApiParam("是否同步ERP: 1=已同步，2=未同步") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description") public Integer isSyncErp; @Transient From 89b0a4a68a404df8455373bbd9196c4dd8787a26 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 6 Sep 2019 15:19:36 +0800 Subject: [PATCH 25/63] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 ++ .../i3plus/pojo/mes/pcn/model/StepPrintSnModel.java | 19 +++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 15 +++++++++++++++ 3 files changed, 36 insertions(+) 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 f2a4690..f8cc7c4 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 @@ -770,6 +770,7 @@ public class MesEnumUtil { STEP_LIST("stepList", "工步列表"), STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), + CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"); private String value; @@ -807,6 +808,7 @@ public class MesEnumUtil { TABLE("table", "表格"), TEXT("text", "正常文本"), EXP_TEXT("exp_text", "异常文本"), + FILE("file", "定制内容文件"), IMAGE("image", "图片"), BUTTON("button", "按钮"); diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index bd0498c..fbae009 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.beans.Transient; import java.util.List; /** @@ -19,4 +20,22 @@ import java.util.List; public class StepPrintSnModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; + + @ApiParam("条码") + private String barCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("批次号") + private String batchNo; + + @ApiParam("客户物料号") + private String boxQty; + + @ApiParam("订单号") + private String orderNo; + + @ApiParam("生产日期") + private String productionTime; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 655ffd0..2ae42f4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; import org.apache.commons.lang3.StringUtils; /** @@ -48,4 +49,18 @@ public class MesHqlPack { } return packBean; } + + /** + * 根据打印模板的模板代码查询模板信息 + * @param organizeCode + * @param mesLabelTemplate + * @return + */ + public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + return packBean; + } + } From 241a478f65a9e5264b07228daa667c11e3ec2516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 6 Sep 2019 16:20:09 +0800 Subject: [PATCH 26/63] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?--=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 105 ++++++--------------- .../pojo/wms/bean/WmsDocMovementDetails.java | 7 ++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 7 ++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 3 + .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 6 ++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 6 ++ 6 files changed, 57 insertions(+), 77 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 53a9315..1eae9c3 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 @@ -228,6 +228,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -514,6 +518,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -589,13 +597,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -873,13 +875,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -925,13 +921,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } public static int descOf(String desc) { @@ -985,13 +975,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } public static int descOf(String desc) { @@ -1053,14 +1037,9 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -1109,13 +1088,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -1157,13 +1130,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -1238,13 +1205,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -1320,6 +1281,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -2742,13 +2707,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -3037,13 +2996,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } } @@ -3149,6 +3102,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -3368,13 +3325,7 @@ public class WmsEnumUtil { } 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; + return valueOf(val); } public static int descOf(String desc) { 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 ec06fce..eb39fc2 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 @@ -1,6 +1,8 @@ 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; @@ -102,6 +104,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") private Integer itemStatus; /** @@ -109,6 +112,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isFree; @Column(name = "REMARK") @@ -185,10 +189,12 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("任务状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") private Integer isTask; @Transient @ApiParam("主表单据状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") private Integer orderMasterStatus; public String getRecommondLot() { @@ -218,6 +224,7 @@ public class WmsDocMovementDetails extends BaseBean { @Transient @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") public Integer busiType; @Column(name = "IS_SN") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index b4b8c3b..49f0d92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -1,6 +1,8 @@ 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; @@ -43,6 +45,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "MOVE_TYPE") @ApiParam("移动类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description") public Integer moveType; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, @@ -51,6 +54,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "BUSI_TYPE") @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") public Integer busiType; /** @@ -59,6 +63,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer orderStatus; @Column(name = "CUST_NO") @@ -90,6 +95,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @Column(name = "PRIORITY") @@ -117,6 +123,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") private Integer isPart; @Column(name = "SRC_WH_NO") 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 e111ab6..4dd4bc7 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 @@ -1,6 +1,8 @@ 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; @@ -65,6 +67,7 @@ public class WmsDocMovementSn extends BaseBean { */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Column(name="SN") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 974933f..ffe25ee 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -1,6 +1,8 @@ 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; @@ -40,6 +42,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description") public Integer orderType; /** @@ -47,6 +50,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -83,9 +87,11 @@ public class WmsQCMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @Column(name="IS_PART") @ApiParam(value = "是否散件", example = "2") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isPart; } 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 d2a7d27..6b721bd 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 @@ -1,6 +1,8 @@ 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; @@ -116,18 +118,21 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") private Integer qcStatus; /** * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") private Integer snStatus; /** * 1:已打印；2：未打印 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") private Integer printed; @Column(name = "PDATE") @@ -155,6 +160,7 @@ public class WmsStockSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description") private Integer snType = 10; @ApiParam(value = "仓库名称") From 61a7985afc1dafdb4b8b9e764d1fde276d4b2bae Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 6 Sep 2019 17:49:43 +0800 Subject: [PATCH 27/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=200905?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/tool/DdlPreparedPack.java | 35 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesESOP.java | 4 +++ 2 files changed, 39 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 40f9822..5bddde0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -54,6 +54,29 @@ public class DdlPreparedPack { /** * 封装日期 * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackBean packBean) { + if (isLeftContain) { + packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, startDate.trim()); + } else { + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, startDate.trim()); + } + if (isRightContain) { + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " <= :m_s_" + columnName, endDate.trim()); + } else { + packBean.addColumnQuery("s_" + columnName, " and model." + columnName + " < :m_s_" + columnName, endDate.trim()); + } + } + + /** + * 封装日期 + * * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） * @param columnName HQL里对应的时间字段 * @param packBean 封装的HQL @@ -348,6 +371,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成大于不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { + packBean.addColumnQuery(columnName, " and model." + columnName + " > :m_" + columnName, data); + } + } + + /** * 封装String对象成小于语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java index e93d75b..15d4363 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java @@ -83,4 +83,8 @@ public class MesESOP extends BaseBean { @ApiParam("FILE_TYPE_NAME") private String fileTypeName; + @Column(name="SYNC_TAG") + @ApiParam("SYNC_TAG") + private Integer syncTag=0; + } From ceced4c4b6b4b971fb6648c1fe18affb6e24c9e9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 6 Sep 2019 19:39:27 +0800 Subject: [PATCH 28/63] =?UTF-8?q?=E6=AC=A7=E6=B4=B2=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F=20=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=BB=84=E4=BB=B6=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 71ba453..a848e46 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -77,6 +77,14 @@ public class BasVendor extends BaseBean{ @ApiParam("手机") private String vendorPhone; + @Column(name = "KILOBIT") + @ApiParam("千位符号") + private String kilobit; + + @Column(name = "DECIMALS") + @ApiParam("小数位符号") + private String decimals; + public BasVendor() { } From 3c6d17a28384a56741b5db1b74a5a7b27a3ad69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 7 Sep 2019 19:55:11 +0800 Subject: [PATCH 29/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9pojo=E6=95=B0=E6=8D=AE?= =?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/base/tool/DdlPreparedPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 5bddde0..55c08ca 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -451,7 +451,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getOrInPack(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { + if (data != null) { packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data); } } @@ -541,8 +541,8 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getNotInPack(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { + public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); } } From e58aaf95b9ba262324b5059438b8366552c42a71 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 9 Sep 2019 10:08:34 +0800 Subject: [PATCH 30/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20WebService?= =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/softswitch/DataSwitchModel.java | 52 +++++------ .../i3plus/pojo/model/softswitch/PojoAuth.java | 100 ++++++++++----------- .../estsh/i3plus/pojo/model/softswitch/Prop.java | 56 ++++++------ .../i3plus/pojo/model/softswitch/Request.java | 66 +++++++------- .../pojo/model/softswitch/SuitServerModel.java | 35 ++++++++ 5 files changed, 172 insertions(+), 137 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java index cf5b891..031e53a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java @@ -1,26 +1,26 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import java.util.List; -import java.util.Map; - -/** - * @Description : 数据模型转换对象 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2019-04-29 11:11 - * @Modify: - **/ -public class DataSwitchModel { - - private String stringVal; - - private Long longVal; - - private Double doubleVal; - - private List listVal; - - private Map mapVal; - - private Object[] arrayVal; -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : 数据模型转换对象 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2019-04-29 11:11 +// * @Modify: +// **/ +//public class DataSwitchModel { +// +// private String stringVal; +// +// private Long longVal; +// +// private Double doubleVal; +// +// private List listVal; +// +// private Map mapVal; +// +// private Object[] arrayVal; +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java index 80e60a2..190882b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java @@ -1,50 +1,50 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("auth") -public class PojoAuth{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer authType; - - @XStreamImplicit - private List params; - - private String authPath; - private String userName ="登录名称"; - private String password ="登录名称"; - private String languageCode ="登录名称"; - - // 认证令牌 - private String token; -// // 认证令牌集合(复杂认证令牌) -// private List tokenList; - // 原始认证数据 - @XStreamCDATA - private String result; - - public PojoAuth(Long id, Integer authType,String authPath, List params) { - this.id = id; - this.authType = authType; - this.authPath = authPath; - this.params = params; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import com.thoughtworks.xstream.annotations.XStreamImplicit; +//import lombok.Data; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("auth") +//public class PojoAuth{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer authType; +// +// @XStreamImplicit +// private List params; +// +// private String authPath; +// private String userName ="登录名称"; +// private String password ="登录名称"; +// private String languageCode ="登录名称"; +// +// // 认证令牌 +// private String token; +//// // 认证令牌集合(复杂认证令牌) +//// private List tokenList; +// // 原始认证数据 +// @XStreamCDATA +// private String result; +// +// public PojoAuth(Long id, Integer authType,String authPath, List params) { +// this.id = id; +// this.authType = authType; +// this.authPath = authPath; +// this.params = params; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java index 248ccd5..974ca0e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java @@ -1,28 +1,28 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午5:18 - * @Modify: - **/ -@Data -@XStreamAlias("prop") -public class Prop { - - @XStreamAsAttribute - private Long id; - private String paramName; - private String paramValue; - - public Prop(Long id, String paramName, String paramValue) { - this.id = id; - this.paramName = paramName; - this.paramValue = paramValue; - } -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午5:18 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("prop") +//public class Prop { +// +// @XStreamAsAttribute +// private Long id; +// private String paramName; +// private String paramValue; +// +// public Prop(Long id, String paramName, String paramValue) { +// this.id = id; +// this.paramName = paramName; +// this.paramValue = paramValue; +// } +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java index 87ac9f0..bfdc68c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java @@ -1,33 +1,33 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("request") -public class Request{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer requestType; - private String requestPath; - - @XStreamCDATA - private String result; - - public Request(Long id, Integer requestType,String requestPath) { - this.id = id; - this.requestType = requestType; - this.requestPath = requestPath; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("request") +//public class Request{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer requestType; +// private String requestPath; +// +// @XStreamCDATA +// private String result; +// +// public Request(Long id, Integer requestType,String requestPath) { +// this.id = id; +// this.requestType = requestType; +// this.requestPath = requestPath; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java new file mode 100644 index 0000000..b78b66f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-9-5 下午7:30 + * @Modify: + **/ +@Data +@XStreamAlias("model") +public class SuitServerModel { + + // 执行方法命令 + private String action; + // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE) + private Integer caseType; + /* 认证使用 以后使用 */ + private String token; + // 传输单对象 + private Object obj; + // 传输集合 + private List list; + // 传输键值对 + private Map map; + // 传输 JSON 数据 + private String json; + +} From 3266c9b1e05b53f8eb376c81bb30468b82ca7876 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 9 Sep 2019 10:21:47 +0800 Subject: [PATCH 31/63] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 2e9a6f6..a0ee7fc 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.andon.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -47,6 +48,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") private String alarmCode; @Column(name = "ACTION_CODE") From a959964950da9a820e8e720acb9f62297e78db8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 9 Sep 2019 10:46:01 +0800 Subject: [PATCH 32/63] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=89?= =?UTF-8?q?=E5=BC=A0=E8=A1=A8=E5=8A=A0=E4=B8=8A=E4=B9=90=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 5 + .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 149 +++++++++++---------- 3 files changed, 87 insertions(+), 72 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 85fd21b..406067c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -3,7 +3,6 @@ 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 com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("创建时间") private String createDateTime; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 64c423c..8a251d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + public WmsMoveMaster(){}; public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, 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 5f423a0..6f7e434 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 @@ -25,7 +25,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_SN", indexes = { +@Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "SN"), @@ -35,80 +35,80 @@ import javax.persistence.*; public class WmsMoveSn extends BaseBean { private static final long serialVersionUID = 1490715681910614399L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam("行号") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam(value = "单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; - @Column(name="CSN") + @Column(name = "CSN") @ApiParam("客户条码") public String csn; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String remark; - @Column(name="LOT_NO") + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; - @Column(name="PACKAGE_NO") + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; - @Column(name="SRC_QTY") + @Column(name = "SRC_QTY") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; @@ -120,51 +120,51 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name="DEST_QTY") + @Column(name = "DEST_QTY") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name="QTY") + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="SRC_QC_STATUS") + @Column(name = "SRC_QC_STATUS") @ApiParam(value = "源质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer srcQcStatus; - @Column(name="SRC_SN_STATUS") + @Column(name = "SRC_SN_STATUS") @ApiParam(value = "源条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer srcSnStatus; - @Column(name="DEST_QC_STATUS") + @Column(name = "DEST_QC_STATUS") @ApiParam(value = "目的质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer descQcStatus; - @Column(name="DEST_SN_STATUS") + @Column(name = "DEST_SN_STATUS") @ApiParam(value = "目的条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer destSnStatus; - @Column(name="DATE_CODE") + @Column(name = "DATE_CODE") @ApiParam("生产日期") public String dateCode; - @Column(name="FIX_LOT_NO") + @Column(name = "FIX_LOT_NO") @ApiParam("特殊批次") public String fixLotNo; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -183,9 +183,15 @@ public class WmsMoveSn extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - public WmsMoveSn(){} + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; - public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ + public WmsMoveSn() { + } + + public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; @@ -199,7 +205,7 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -207,7 +213,8 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) { + + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -215,38 +222,38 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } - public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, - String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, - String createUser,String createDatetime,String modifyDatetime,String modifyUser){ - this.organizeCode=organizeCode; - this.orderNo=orderNo; - this.item=item; - this.partNo=partNo; - this.partNameRdd=partNameRdd; - this.transTypeCode=transTypeCode; - this.transTypeName=transTypeName; - this.itemStatus=itemStatus; - this.unit=unit; - this.srcLocateNo=srcLocateNo; - this.destLocateNo=destLocateNo; - this.srcQty=srcQty; - this.srcQty=srcQty; - this.destQty=destQty; - this.srcQcStatus=srcQcStatus; - this.descQcStatus=descQcStatus; - this.srcSnStatus=srcSnStatus; - this.destSnStatus=destSnStatus; - this.lotNo=lotNo; - this.dateCode=dateCode; - this.refSrc = refSrc; - this.destZoneNo = destZoneNo; - this.destWhNo =destWhNo; - this.busiTypeCode = busiTypeCode; - this.sn = sn; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } } From 029d7eac620d6532a752aa48ffcce85c315b8c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Sep 2019 11:57:23 +0800 Subject: [PATCH 33/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8Dmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/common/XStreamFactory.java | 2 +- ...hEnumUtil.java => BlockSoftSwitchEnumUtil.java} | 41 ++++++++++++++++++++-- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 2 ++ .../pojo/model/softswitch/BsSuitCaseModel.java | 28 +++++++++++++++ .../pojo/model/softswitch/SuitCoreModel.java | 12 ++++--- .../i3plus/pojo/softswitch/bean/BsDataSource.java | 2 +- .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 10 +++++- ...urceSuitCase.java => BsSuitCaseDataSource.java} | 13 +++++-- ...seTable.java => BsSuitCaseDataSourceTable.java} | 20 +++++++++-- .../repository/BsDataSourceSuitCaseRepository.java | 4 +-- .../BsDataSourceSuitCaseTableRepository.java | 4 +-- 11 files changed, 119 insertions(+), 19 deletions(-) rename modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/{SoftSwitchEnumUtil.java => BlockSoftSwitchEnumUtil.java} (92%) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/{BsDataSourceSuitCase.java => BsSuitCaseDataSource.java} (78%) rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/{BsDataSourceSuitCaseTable.java => BsSuitCaseDataSourceTable.java} (77%) 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 909db97..85dbd40 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 @@ -60,7 +60,7 @@ public class XStreamFactory { } }); - xStream.setMode(XStream.NO_REFERENCES); +// xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); return xStream; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java similarity index 92% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 787d5c0..e6c7938 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-08-13 9:34 * @Modify: **/ -public class SoftSwitchEnumUtil { +public class BlockSoftSwitchEnumUtil { /** * 套件类型 @@ -234,7 +234,7 @@ public class SoftSwitchEnumUtil { return tmp; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { + public static DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -267,7 +267,7 @@ public class SoftSwitchEnumUtil { return null; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -443,4 +443,39 @@ public class SoftSwitchEnumUtil { } } + /** + * 数据库操作方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATABASE_OPERATE_TYPE{ + READ(1,"读取"), + WRITE(2,"写入"); + + private int value; + private String description; + + DATABASE_OPERATE_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; + } + } + } 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 dea5ebf..ed8e820 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 @@ -341,6 +341,8 @@ public final class FormHqlPack { DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNumEqualPack( + CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack( CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 按顺序字段进行排序 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java new file mode 100644 index 0000000..cf7567b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 适配器model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-04 15:30 + * @Modify: + **/ +@Data +public class BsSuitCaseModel { + + @ApiParam(value = "适配器") + BsSuitCase bsSuitCase; + + @ApiParam(value = "数据源适配套件") + BsSuitCaseDataSource bsDataSourceSuitCase; + + @ApiParam(value = "socket适配套件") + BsSocketSuitCase bsSocketSuitCase; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 3b748f8..2283d83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -86,15 +86,19 @@ public class SuitCoreModel { private String suitResultMessage; /** - * * @param requestSource 请求来源 - * @param sslKey 适配认证对象 - * @param bsSuitCase 适配器信息 + * @param sslKey 适配认证对象 + * @param bsSuitCase 适配器信息 */ - public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { + public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){ + this(requestSource,sslKey, bsSuitCase,null); + } + + public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) { this.sslKey = sslKey; this.bsSuitCase = bsSuitCase; this.requestSource = requestSource; + this.bsSuitCaseDetail = bsSuitCaseDetail; // 设置套件类型 this.caseType = bsSuitCase.getCaseTypeId(); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index eeca022..5881a9c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -61,7 +61,7 @@ public class BsDataSource extends BaseBean { @Column(name = "DATA_SOURCE_STATUS") @ApiParam(value = "数据源状态") - private String dataSourceStatus; + private Integer dataSourceStatus; @Column(name = "DATA_SOURCE_DESCRIPTION") @ApiParam(value = "数据源描述") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index f5d8f9e..db8c3a3 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -107,7 +107,15 @@ public class BsSuitCase extends BaseBean { private Integer suitCaseStatus; @Transient + @ApiParam(value = "适配器套件明细") + private Object bsSuitCaseDetail; + + @Transient @ApiParam(value = "适配器参数") - List bsSuitCaseParamList; + private List bsSuitCaseParamList; + + @Transient + @ApiParam(value = "参数转换") + private List bsParamAdapterList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java similarity index 78% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index 738d19a..7ffc6d1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -12,6 +12,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 : 数据库套件 @@ -25,9 +27,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE") @Api(value = "数据库套件", description = "数据库套件") -public class BsDataSourceSuitCase extends BaseBean { +public class BsSuitCaseDataSource extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -46,5 +48,12 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源名称") private String dataSourceNameRdd; + @Transient + @ApiParam(value = "数据源") + private BsDataSource bsDataSource; + + @Transient + @ApiParam(value = "数据库操作") + private List bsDataSourceSuitCaseTableList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java similarity index 77% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index 5e86604..838514a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE") @Api(value = "数据库表操作", description = "数据库表操作") -public class BsDataSourceSuitCaseTable extends BaseBean { +public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -42,6 +42,13 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @ApiParam(value = "操作类型") private Integer operateTypeId; + public int getOperateTypeIdVal(){ + if(operateTypeId == null){ + return -1; + } + return operateTypeId.intValue(); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -52,7 +59,14 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @Column(name = "IS_RETURN") @ApiParam(value = "是否有返回") - private String isReturn; + private Integer isReturn; + + public int getIsReturnVal(){ + if(isReturn == null){ + return -1; + } + return isReturn.intValue(); + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java index eadac50..2ef87e4 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseRepository extends BaseRepository { +public interface BsDataSourceSuitCaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java index 16100db..750f45a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { +public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { } From 5b200f824fc5bd191006739776a3b92552bbd350 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 9 Sep 2019 11:59:58 +0800 Subject: [PATCH 34/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20WebService?= =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hEnumUtil.java => BlockSoftSwitchEnumUtil.java} | 70 ++++++++++++++++------ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++ .../pojo/softswitch/bean/BsSuitCaseWebService.java | 46 ++++++++++++++ .../repository/BsSuitCaseWebServiceRepository.java | 14 +++++ 4 files changed, 117 insertions(+), 17 deletions(-) rename modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/{SoftSwitchEnumUtil.java => BlockSoftSwitchEnumUtil.java} (88%) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java similarity index 88% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 787d5c0..6b39857 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -10,19 +10,19 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-08-13 9:34 * @Modify: **/ -public class SoftSwitchEnumUtil { +public class BlockSoftSwitchEnumUtil { /** * 套件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CASE_TYPE{ - SOCKET(1,"SOCKET"), - RESTFUL(2,"RESTFUL"), - DATASOURCE(3,"数据源"), - WEBSERVICE(4,"WebService"), - MQ(5,"消息队列"), - WebSocket(6,"WebSocket"); + SOCKET(10,"SOCKET"), + RESTFUL(20,"RESTFUL"), + DATASOURCE(30,"数据源"), + WEBSERVICE(40,"WebService"), + MQ(50,"消息队列"), + WebSocket(60,"WebSocket"); private int value; private String description; @@ -57,7 +57,8 @@ public class SoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REQUEST_SOURCE{ ACTIVE(1,"主动请求"), - SCHEDULE(2,"定时调度"); + SCHEDULE(2,"定时调度"), + RABBITMQ(3,"MQ 调用"); private int value; private String description; @@ -234,7 +235,7 @@ public class SoftSwitchEnumUtil { return tmp; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -267,7 +268,7 @@ public class SoftSwitchEnumUtil { return null; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -304,11 +305,11 @@ public class SoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUM(1,"数字"), - STRING(2,"字符串"), - BOOLEAN(3,"布尔"), - MAP(4,"字典"), - LIST(5,"列表"); + NUM(10,"数字"), + STRING(20,"字符串"), + BOOLEAN(30,"布尔"), + MAP(40,"字典"), + LIST(50,"列表"); private int value; private String description; @@ -378,8 +379,8 @@ public class SoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_MODE{ - ACTIVE(1,"主动"), - PASSIVE(2,"被动"); + ACTIVE(1,"客户端"), + PASSIVE(2,"服务端"); private int value; private String description; @@ -443,4 +444,39 @@ public class SoftSwitchEnumUtil { } } + /** + * 适配方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_SERVER_WEB_SERVICE{ + ACTIVE(40001,"hello"), + SCHEDULE(40002,"邮件测试"); + + private int value; + private String description; + + SUIT_SERVER_WEB_SERVICE(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-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index f5d8f9e..84b77c1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -61,6 +61,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; + @Column(name = "SUIT_SERVER_ACTION") + @ApiParam(value = "Server 适配命令") + private String suitServerAction; + @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") private String suitCaseHost; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java new file mode 100644 index 0000000..c5e2ef6 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.softswitch.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 : WebService 适配套件 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_WEB_SERVICE") +@Api(value = "WebService", description = "WebService 适配套件") +public class BsSuitCaseWebService extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SERVICE_TAG_NAME") + @ApiParam(value = "Service Tag Name(包名称)") + private String serviceTagName; + + @Column(name = "SERVICE_FUNCTION_NAME") + @ApiParam(value = "Service Function Name(方法名称)") + private String serviceFunctionName; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java new file mode 100644 index 0000000..dd92a85 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:41 + * @Modify: + **/ +public interface BsSuitCaseWebServiceRepository extends BaseRepository { +} From f63cd5071b3ad668572c8ad01395f42f8c19bf09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 9 Sep 2019 14:10:42 +0800 Subject: [PATCH 35/63] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8F=A3?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/bean/iotio/SwebProcurementPlanOrder.java | 52 ++++++++++++++++++++++ .../SwebProcurementPlanOrderRepository.java | 16 +++++++ 2 files changed, 68 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java new file mode 100644 index 0000000..1b43c58 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean.iotio; + +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 : 开口合同主表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-09 11:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SWEB_PROCUREMENT_PLAN_ORDER") +@Api("开口合同主表") +public class SwebProcurementPlanOrder extends BaseBean { + + private static final long serialVersionUID = -4332932784803175933L; + @Column(name = "ORDER_NO") + @ApiParam(value = "合同号") + private String orderNo; + + @Column(name = "VENDOR_CODE") + @ApiParam(value = "物料名称") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "物料名称") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam(value = "物料名称") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java new file mode 100644 index 0000000..130a355 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.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.iotio.SwebProcurementPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-09 14:49 + * @Modify: + **/ +@Repository +public interface SwebProcurementPlanOrderRepository extends BaseRepository { +} From c9500190777be04b599dfeb46a87cad4296c9997 Mon Sep 17 00:00:00 2001 From: wangjie Date: Mon, 9 Sep 2019 16:13:47 +0800 Subject: [PATCH 36/63] =?UTF-8?q?pcn=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 7 ------- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 7 ------- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 --- 3 files changed, 17 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 63ea2de..6088218 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } 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 432e829..2da3ec8 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 @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } 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 19ce394..9c3a317 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 @@ -1161,9 +1161,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); - if (null != mesPcnTask.getTaskStatus()) { - DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean); - } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } From b899c5c8c5cd34b341adac88f2e38fd27379dc12 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 9 Sep 2019 18:08:28 +0800 Subject: [PATCH 37/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20WebService?= =?UTF-8?q?=20=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 8 +++-- .../pojo/model/softswitch/BsSuitCaseModel.java | 10 ++++-- .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 8 ++--- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 40 ++++++++++++++-------- 4 files changed, 41 insertions(+), 25 deletions(-) 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 a088b28..66e1dfc 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 @@ -484,14 +484,16 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_SERVER_WEB_SERVICE{ - ACTIVE(40001,"hello"), - SCHEDULE(40002,"邮件测试"); + ACTIVE(40001,"serverWebServiceHello","hello"), + SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试"); private int value; private String description; + private String clazzName; - SUIT_SERVER_WEB_SERVICE(int value, String description) { + SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) { this.value = value; + this.clazzName = clazzName; this.description = description; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index cf7567b..508888d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,12 +18,15 @@ import lombok.Data; public class BsSuitCaseModel { @ApiParam(value = "适配器") - BsSuitCase bsSuitCase; + private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsDataSourceSuitCase; @ApiParam(value = "socket适配套件") - BsSocketSuitCase bsSocketSuitCase; + private BsSocketSuitCase bsSocketSuitCase; + + @ApiParam(value = "Web Service 适配套件") + private BsSuitCaseWebService webService; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index e941685..fe70272 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -49,9 +49,9 @@ public class BsSuitCase extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitTypeId; - @Column(name = "SUIT_TYPE_NAME") + @Column(name = "SUIT_TYPE_NAME_RDD") @ApiParam(value = "适配类型名称") - private String suitTypeName; + private String suitTypeNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配器代码") @@ -61,9 +61,9 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; - @Column(name = "SUIT_SERVER_ACTION") + @Column(name = "SUIT_SERVER_ACTION_ID") @ApiParam(value = "Server 适配命令") - private String suitServerAction; + private Integer suitServerActionId; @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 0190f85..362bc5b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -47,7 +47,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); @@ -65,7 +65,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -80,12 +80,12 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); @@ -99,7 +99,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean); @@ -113,7 +113,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); @@ -131,7 +131,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -147,7 +147,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); @@ -165,7 +165,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); @@ -180,7 +180,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); @@ -196,7 +196,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); @@ -210,7 +210,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -226,7 +226,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -240,7 +240,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -258,7 +258,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -266,4 +266,14 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * WebService 唯一校验 + * @param webService + * @return + */ + public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + return result; + } } From 0ac5232eb0d924bea180b5f448a79852b5aa8fce Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 9 Sep 2019 18:08:51 +0800 Subject: [PATCH 38/63] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E9=BB=98=E8=AE=A4=E5=80=BC=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 511e343..a102246 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean { @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; - public Object getFormValue() { - return propertyFormValue; - } +// public Object getFormValue() { +// return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; +// } } From 4c39e840949e0199ae299a5039691158c641be6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 9 Sep 2019 19:15:51 +0800 Subject: [PATCH 39/63] =?UTF-8?q?asn=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 70 ++++++++++++++++++++++ 1 file changed, 70 insertions(+) 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 897f091..a4e4142 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 @@ -122,4 +122,74 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("手机") private String vendorPhone; + + @Transient + @ApiParam("物料代码") + private String partNo; + + @Transient + @ApiParam("物料名称") + private String partNoNameRdd; + + @Transient + @ApiParam("收货数量") + private Double sumRecQty; + + @Transient + @ApiParam("需求数量") + private Double sumQty; + + @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划日期开始") + private String planDateStart; + + @Transient + @ApiParam("计划日期结束") + private String planDateEnd; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("差异数量") + private Double diffQty; + + @Transient + @ApiParam("单据类型") // PO/ASN + private String orderType; + + @Transient + @ApiParam("收货状态") + private String recStatus; + + @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + public WmsASNMaster(){} + + public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd, + Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, + String recStatus){ + + this.orderNo = orderNo; + this.asnStatus = asnStatus; + this.vendorNo = vendorNo; + this.partNo = partNo; + this.partNoNameRdd = partNoNameRdd; + this.sumQty = sumQty; + this.sumRecQty = sumRecQty; + this.planDate = planDate; + this.planTime = planTime; + this.diffQty = diffQty; + this.orderType = orderType; + this.recStatus = recStatus; + } + + } From 677632748da2eaa695a4c454f4605e3f1bba359a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 9 Sep 2019 21:31:46 +0800 Subject: [PATCH 40/63] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9sql?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98=E5=9C=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 69fe0bd..6bb6906 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean { public WmsPOMasterDetails(){} - public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){ + public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){ this.orderNo = orderNo; this.containerNo = containerNo; this.partNo = partNo; this.item = item; this.organizeCode = organizeCode; + this.erpAreaNo = erpAreaNo; } } From 8d6e4fdfa5ab2b859242efdbeb21659564d99a97 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 9 Sep 2019 21:41:30 +0800 Subject: [PATCH 41/63] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8c51e62..421410e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -116,7 +116,7 @@ public class WmsCSFactTrans extends BaseBean { public Double sumPartQty; @Transient - @ApiParam("存储区编号") + @ApiParam("存储区编号组") public String[] zoneNos; public WmsCSFactTrans(){} From 315787197a460c45c39b37d5cc007945a94868d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 10 Sep 2019 11:30:59 +0800 Subject: [PATCH 42/63] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E5=85=8D=E6=A3=80=E5=86=99=E5=85=A5=E6=94=B6=E8=B4=A7=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E5=8F=96=E7=9B=AE=E7=9A=84=E5=BA=93=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E5=80=BC+=E4=B9=90=E8=A7=82=E9=94=81=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 406067c..d16a300 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -176,7 +176,7 @@ public class WmsMoveDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 8a251d8..0ffaeb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -147,7 +147,7 @@ public class WmsMoveMaster extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public WmsMoveMaster(){}; 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 6f7e434..aab7504 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 @@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public WmsMoveSn() { } From f205373964532f5134fd263aa167a87ce135a5ce Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 10 Sep 2019 15:27:37 +0800 Subject: [PATCH 43/63] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index a0ee7fc..db58777 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -48,7 +48,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") private String alarmCode; @Column(name = "ACTION_CODE") From 5144d15ac4a3a57da563c16e4231109f2f17d72a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 10 Sep 2019 16:03:15 +0800 Subject: [PATCH 44/63] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 11 +++-- 2 files changed, 61 insertions(+), 3 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 1eae9c3..69cb407 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 @@ -3339,4 +3339,57 @@ public class WmsEnumUtil { } } + /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS{ + UNRECEIVED("UNRECEIVED", "未收货"), + COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), + PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), + OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), + OTHER("ELSE", "其他"),; + + private String value; + private String description; + + REC_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + + public static String getDes(String 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(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index a4e4142..22f00de 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 @@ -1,6 +1,8 @@ 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; @@ -41,6 +43,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer asnStatus; @Column(name = "VENDOR_NO") @@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @ApiParam("ASN详情列表") @@ -129,7 +133,7 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("物料名称") - private String partNoNameRdd; + private String partNameRdd; @Transient @ApiParam("收货数量") @@ -165,6 +169,7 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("收货状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description") private String recStatus; @Transient @@ -173,7 +178,7 @@ public class WmsASNMaster extends BaseBean { public WmsASNMaster(){} - public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd, + public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd, Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, String recStatus){ @@ -181,7 +186,7 @@ public class WmsASNMaster extends BaseBean { this.asnStatus = asnStatus; this.vendorNo = vendorNo; this.partNo = partNo; - this.partNoNameRdd = partNoNameRdd; + this.partNameRdd = partNameRdd; this.sumQty = sumQty; this.sumRecQty = sumRecQty; this.planDate = planDate; From 58d6305bd3d31b1c72ec0db47a31c639c279f785 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 10 Sep 2019 16:35:23 +0800 Subject: [PATCH 45/63] =?UTF-8?q?mes=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 9c3a317..0fa4064 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 @@ -542,7 +542,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesAction(MesAction mesAction) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode()); + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, mesAction.getOrganizeCode()); DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); @@ -1182,4 +1182,17 @@ public class MesHqlPack { } return packBean; } + + /** + * 系统业务动作 + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionAllData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } } From 21241e45ca476ec8f4a2c556725e42368fe893fa Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 10 Sep 2019 16:38:06 +0800 Subject: [PATCH 46/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 42 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) 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 66e1dfc..1567e5b 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 @@ -480,12 +480,12 @@ public class BlockSoftSwitchEnumUtil { } /** - * 适配方式 + * WebService Server 服务端命令 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_SERVER_WEB_SERVICE{ - ACTIVE(40001,"serverWebServiceHello","hello"), - SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试"); + ACTIVE(40002,"serverWebServiceHello","hello"), + SCHEDULE(40004,"serverWebServiceSendEmail","邮件测试"); private int value; private String description; @@ -516,4 +516,40 @@ public class BlockSoftSwitchEnumUtil { } } + /** + * WebService Server 服务端命令 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_SERVER_WEB_CLIENT{ + ACTIVE(40001,"softswitchClient","软适配服务邮件服务"); + + private int value; + private String description; + private String clazzName; + + SUIT_SERVER_WEB_CLIENT(int value, String clazzName,String description) { + this.value = value; + this.clazzName = clazzName; + 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; + } + } + } From f2e2dd1670c8add51b00360f0def0ce085899b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 10 Sep 2019 16:40:38 +0800 Subject: [PATCH 47/63] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=20=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=20=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E9=AB=98?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/common/XStreamFactory.java | 10 ++++++++ .../pojo/model/softswitch/BsSuitCaseModel.java | 5 +++- .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 15 +++++++++-- .../pojo/softswitch/bean/BsSuitCaseDataSource.java | 4 --- ...ry.java => BsSuitCaseDataSourceRepository.java} | 2 +- ...va => BsSuitCaseDataSourceTableRepository.java} | 2 +- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 30 +++++++++++++++++++++- 7 files changed, 58 insertions(+), 10 deletions(-) rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/{BsDataSourceSuitCaseRepository.java => BsSuitCaseDataSourceRepository.java} (86%) rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/{BsDataSourceSuitCaseTableRepository.java => BsSuitCaseDataSourceTableRepository.java} (86%) 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 85dbd40..23f4dc5 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 @@ -123,6 +123,16 @@ public class XStreamFactory { } /** + * Javabean 转XML + * @param + * @return xml字符串 + */ + public static String toXmlNoHeadLine(T t) { + xStream.processAnnotations(t.getClass()); + return xStream.toXML(t); + } + + /** * XML字符串转javabean * * @param xmlStr xml字符串 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index cf7567b..abb41bd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,11 +1,15 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; + /** * @Description : 适配器model * @Reference : @@ -24,5 +28,4 @@ public class BsSuitCaseModel { @ApiParam(value = "socket适配套件") BsSocketSuitCase bsSocketSuitCase; - } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index db8c3a3..fafad2e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -49,6 +49,13 @@ public class BsSuitCase extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitTypeId; + public long getSuitTypeIdVal(){ + if(suitTypeId != null){ + return -1; + } + return suitTypeId.longValue(); + } + @Column(name = "SUIT_TYPE_NAME") @ApiParam(value = "适配类型名称") private String suitTypeName; @@ -115,7 +122,11 @@ public class BsSuitCase extends BaseBean { private List bsSuitCaseParamList; @Transient - @ApiParam(value = "参数转换") - private List bsParamAdapterList; + @ApiParam(value = "入参转换") + private List bsInParamAdapterList; + + @Transient + @ApiParam(value = "出参转换") + private List bsOutParamAdapterList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index 7ffc6d1..a4631b7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -36,10 +36,6 @@ public class BsSuitCaseDataSource extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; - @Column(name = "DATA_SOURCE_MODE_ID") - @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）") - private Integer dataSourceModeId; - @Column(name = "DATA_SOURCE_CODE") @ApiParam(value = "数据源编码") private String dataSourceCode; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceRepository.java similarity index 86% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceRepository.java index 2ef87e4..c884383 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseRepository extends BaseRepository { +public interface BsSuitCaseDataSourceRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceTableRepository.java similarity index 86% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceTableRepository.java index 750f45a..4e08bf5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceTableRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { +public interface BsSuitCaseDataSourceTableRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 0190f85..29e0594 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -85,7 +85,6 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); @@ -266,4 +265,33 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 数据源适配操作查询条件封装 + * @param bsSuitCaseDataSourceTable + * @return + */ + public static DdlPackBean packHqlBsSuitCaseDataSourceTable(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据适配操作操作唯一校验 + * @param bsSuitCaseDataSourceTable + * @return + */ + public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean); + + return ddlPackBean; + } + } From 8ed0d4d60e34572ed1958dfe101822da67605229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 10 Sep 2019 16:54:19 +0800 Subject: [PATCH 48/63] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +++- 1 file changed, 3 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 1eae9c3..7fe95a1 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 @@ -717,7 +717,9 @@ public class WmsEnumUtil { OUTSTOCK("OUTSTOCK", "出库"), INSTOCK("INSTOCK", "入库"), MOVESTOCK("MOVESTOCK", "移库"), - CS("CS", "盘点"); + CS("CS", "盘点"), + VDARC("VDARC", "VDA收货"); + private String value; private String description; From 07688db53347aa6afb818b7f165ad8d2b3d69402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 10 Sep 2019 17:01:45 +0800 Subject: [PATCH 49/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=9E?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LinkedCaseInsensitiveMapConverter.java | 25 ++++++++++++++++++++++ .../base/enumutil/BlockSoftSwitchEnumUtil.java | 10 +++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 7 ++++++ 3 files changed, 42 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/converter/LinkedCaseInsensitiveMapConverter.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/converter/LinkedCaseInsensitiveMapConverter.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/converter/LinkedCaseInsensitiveMapConverter.java new file mode 100644 index 0000000..4a604b4 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/converter/LinkedCaseInsensitiveMapConverter.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.base.common.converter; + +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.collections.MapConverter; +import com.thoughtworks.xstream.mapper.Mapper; +import org.springframework.util.LinkedCaseInsensitiveMap; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-09 14:35 + * @Modify: + **/ +public class LinkedCaseInsensitiveMapConverter extends MapConverter implements Converter { + + public LinkedCaseInsensitiveMapConverter(Mapper mapper) { + super(mapper); + } + + @Override + public boolean canConvert(Class aClass) { + return aClass.equals(LinkedCaseInsensitiveMap.class); + } +} 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 e6c7938..d6ad5bc 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 @@ -49,6 +49,16 @@ public class BlockSoftSwitchEnumUtil { } return tmp; } + + public static CASE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index fafad2e..2432c18 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -39,6 +39,13 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "套件类型id(枚举)") private Integer caseTypeId; + public int getCaseTypeIdVal(){ + if(caseTypeId == null) { + return -1; + } + return caseTypeId.intValue(); + } + @Column(name = "CASE_DETAIL_ID") @ApiParam(value = "适配器明细id") @JsonSerialize(using = ToStringSerializer.class) From 262f7efe05baa1730123375c62eab5873a35ccb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 10 Sep 2019 17:02:13 +0800 Subject: [PATCH 50/63] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81=E5=8F=A0=E5=8A=A0?= =?UTF-8?q?=E5=9C=A8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=89=8D=E4=B8=80?= =?UTF-8?q?=E8=B5=B7=E8=BF=94=E5=9B=9E=E7=BB=99=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 9ef9648..40edbf5 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 @@ -41,6 +41,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("总步数") public int totalStep; + @ApiParam("错误提示信息") + public String errorMsg; + @ApiParam("提示信息") public String message; @@ -49,14 +52,16 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("可选项") public List options; - public List getOptions(){ - if(options == null){ + + public List getOptions() { + if (options == null) { options = new ArrayList<>(); } return options; } - public void setOptions(List opt){ - if(opt == null){ + + public void setOptions(List opt) { + if (opt == null) { opt = new ArrayList<>(); } options = opt; From 71798e9f51a92a0de57e520e039c23b3cc15cd49 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 10 Sep 2019 17:19:01 +0800 Subject: [PATCH 51/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 49 ++++++---------------- 1 file changed, 12 insertions(+), 37 deletions(-) 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 1567e5b..fd3ddbd 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 @@ -379,8 +379,8 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_MODE{ - ACTIVE(1,"客户端"), - PASSIVE(2,"服务端"); + CLIENT(1,"客户端"), + SERVER(2,"服务端"); private int value; private String description; @@ -484,17 +484,19 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_SERVER_WEB_SERVICE{ - ACTIVE(40002,"serverWebServiceHello","hello"), - SCHEDULE(40004,"serverWebServiceSendEmail","邮件测试"); + SCHEDULE(40001,"serverWebServiceSendEmail","邮件测试",SUIT_MODE.SERVER), + ACTIVE(40002,"softswitchClient","软适配服务邮件服务",SUIT_MODE.CLIENT); private int value; private String description; private String clazzName; + private SUIT_MODE mode; - SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) { + SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description,SUIT_MODE mode) { this.value = value; this.clazzName = clazzName; this.description = description; + this.mode = mode; } public int getValue() { @@ -505,40 +507,12 @@ public class BlockSoftSwitchEnumUtil { 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; - } - } - - /** - * WebService Server 服务端命令 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_SERVER_WEB_CLIENT{ - ACTIVE(40001,"softswitchClient","软适配服务邮件服务"); - - private int value; - private String description; - private String clazzName; - - SUIT_SERVER_WEB_CLIENT(int value, String clazzName,String description) { - this.value = value; - this.clazzName = clazzName; - this.description = description; + public String getClazzName() { + return clazzName; } - public int getValue() { - return value; - } - - public String getDescription() { - return description; + public SUIT_MODE getMode() { + return mode; } public static String valueOfDescription(int val) { @@ -552,4 +526,5 @@ public class BlockSoftSwitchEnumUtil { } } + } From 5b7ac2c344171ed4922957d4c4fcc94754a806aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 10 Sep 2019 18:07:02 +0800 Subject: [PATCH 52/63] =?UTF-8?q?ASN=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 22f00de..2fb7868 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 @@ -128,7 +128,7 @@ public class WmsASNMaster extends BaseBean { private String vendorPhone; @Transient - @ApiParam("物料代码") + @ApiParam("物料编码") private String partNo; @Transient @@ -173,7 +173,7 @@ public class WmsASNMaster extends BaseBean { private String recStatus; @Transient - @ApiParam("项目代码") + @ApiParam("项目") private String prodCfgTypeCode; public WmsASNMaster(){} From f718a5dac52dbca75e7c53cc308a8a0fe44b9baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 10 Sep 2019 18:12:58 +0800 Subject: [PATCH 53/63] =?UTF-8?q?excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 148494f..9160ade 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -47,6 +47,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数名称)") private String paramName; + @Column(name = "PARENT_PARAM_NAME") + @ApiParam(value = "上级参数名称)") + private String parentParamName; + @Column(name = "PARAM_VAL_TYPE_ID") @ApiParam(value = "参数值类型") private Integer paramValTypeId; From 3454712bd2dab6ce0025e23aea48d72c38d90750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Wed, 11 Sep 2019 14:00:37 +0800 Subject: [PATCH 54/63] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E7=9A=84=E7=B1=BB=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/snapshot/WmsCheckPoint.java | 27 ++ .../wms/bean/snapshot/WmsMoveDetailsSnapshot.java | 268 +++++++++++++++++++ .../wms/bean/snapshot/WmsMoveMasterSnapshot.java | 209 +++++++++++++++ .../pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java | 265 +++++++++++++++++++ .../wms/bean/snapshot/WmsStockQuanSnapshot.java | 292 +++++++++++++++++++++ .../pojo/wms/bean/snapshot/WmsStockSnSnapshot.java | 268 +++++++++++++++++++ 6 files changed, 1329 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java new file mode 100644 index 0000000..738ffbc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_CHECK_POINT") +public class WmsCheckPoint extends BaseBean { + + private static final long serialVersionUID = 5589497687871639189L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java new file mode 100644 index 0000000..01b8aa1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveDetailsSnapshot.java @@ -0,0 +1,268 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +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.*; + +/** + * @Description : 库存移动单明细信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_MOVE_DETAILS_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +@Api("库存移动单明细信息") +public class WmsMoveDetailsSnapshot extends BaseBean { + + private static final long serialVersionUID = -4095410692227226944L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam(value = "行号", example = "0") + public Integer item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + public String vendorNo; + + @Column(name="CUST_NO") + @ApiParam("客户编号") + public String custNo; + + @Column(name="TRANS_QTY") + @ApiParam(value = "处理数量", example = "0") + public Double transQty; + + public Double getTransQty(){ + return this.transQty == null ? 0 : this.transQty.doubleValue(); + } + + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格处理数量", example = "0") + public Double rejectQty; + + public Double getRejectQty(){ + return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); + } + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + @Column(name="SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name="SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name="SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name="DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name="DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name="DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + @Column(name="ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + public Integer itemStatus; + + @Column(name="REF_ITEM") + @ApiParam("关联单据行号") + public String refItem; + + /** + * ASN,PO,SO + */ + @Column(name="REF_TYPE") + @ApiParam("关联单据类型") + public String refType; + + @Column(name="REF_SRC") + @ApiParam("关联单号") + public String refSrc; + + @ApiParam(value = "待出库数量", example = "0") + @Transient + private Long waitingCounts; + + @ApiParam(value = "已出库数量", example = "0") + @Transient + private Long finishedCounts; + + @Transient + @ApiParam("交易类型") + private String transTypeCode; + + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("条码") + private String sn; + + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + + @Transient + @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + private Integer busiTypeCode; + + @Transient + @ApiParam("生产线") + private String workCenterCode; + + @Transient + @ApiParam("父物料编码") + private String fpartNo; + + @Transient + @ApiParam("父物料名称") + private String fpartName; + + @Transient + @ApiParam("数量") + private Double qty; + + @Transient + @ApiParam("创建时间") + private String createDateTime; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + /* @JSONField(name="fPartNo") + public String getfPartNo() { + return fPartNo; + } + + @JSONField(name="fPartName") + public String getfPartName() { + return fPartName; + }*/ + + public WmsMoveDetailsSnapshot(){} + + public WmsMoveDetailsSnapshot(String partNo, Long waitingCounts , Long finishedCounts){ + this.partNo = partNo; + this.waitingCounts = waitingCounts; + this.finishedCounts = finishedCounts; + } + + public WmsMoveDetailsSnapshot(String partNo, double transQty){ + this.partNo = partNo; + this.transQty = transQty; + } + + public WmsMoveDetailsSnapshot(String orderNo){ + this.orderNo = orderNo; + } + + public Long getWaitingCounts() { + return waitingCounts == null ? 0L : this.waitingCounts; + } + + public Long getFinishedCounts() { + return finishedCounts == null ? 0L : this.finishedCounts; + } + + public WmsMoveDetailsSnapshot(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, + String createDateTime, String sn, String srcZoneNo){ + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workCenterCode = workCenterCode; + this.fpartNo = fPartNo; + this.fpartName = fPartName; + this.unit = unit; + this.qty = qty; + this.createDateTime = createDateTime; + this.sn = sn; + this.srcZoneNo = srcZoneNo; + + } + + public WmsMoveDetailsSnapshot(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, String transTypeCode + , String transTypeName, Integer itemStatus, String unit, String srcWhNo, String destWhNo, + String srcZoneNo, String destZoneNo, String srcLocateNo, String destLocateNo, + Double transQty, Double rejectQty, String refSrc, String vendorNo, String custNo, Integer busiTypeCode, + String createUser, String createDatetime, String modifyUser, String modifyDatetime){ + this.organizeCode = organizeCode; + this.partNo = partNo; + this.orderNo = orderNo; + this.item = item; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.destWhNo = destWhNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.refSrc = refSrc; + this.vendorNo = vendorNo; + this.custNo = custNo; + this.busiTypeCode = busiTypeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java new file mode 100644 index 0000000..06890f3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveMasterSnapshot.java @@ -0,0 +1,209 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +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.*; + +/** + * @Description : 库存移动单主表信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_MOVE_MASTER_SNAPSHOT", indexes = { + @Index(columnList = "TRANS_TYPE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +@Api("库存移动单主表信息") +public class WmsMoveMasterSnapshot extends BaseBean { + + private static final long serialVersionUID = 3569874772643448726L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单号") + public String orderNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + public Integer orderStatus; + + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Lob + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + + @Column(name="IS_URGENT") + @ApiParam(value = "是否紧急", example = "0") + public Integer isUrgent; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; + + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + private Integer busiTypeCode; + + @Column(name = "REF_ORDER_NO") + @ApiParam("关联移动单号") + public String refOrderNo; + + @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient + @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + private Integer itemStatus; + + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("关联单号") + private String refSrc; + + @Transient + @ApiParam("目标仓库") + private String destWhNo; + + @Transient + @ApiParam("存储区") + private String destZoneNo; + + @Transient + @ApiParam("供应商编码") + private String vendorNo; + + @Transient + @ApiParam("条码") + private String sn; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; + + @Transient + @ApiParam("单位") + private String unit; + + @Transient + @ApiParam("源仓库") + private String srcWhNo; + + @Transient + @ApiParam("源存储区代码") + private String srcZoneNo; + + @Transient + @ApiParam("处理数量") + private Double transQty; + + @Transient + @ApiParam("不合格处理数量") + private Double rejectQty; + + @Transient + @ApiParam("库位") + private String destLocateNo; + + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + + public WmsMoveMasterSnapshot(){}; + + public WmsMoveMasterSnapshot(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent=isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.partNo = partNo; + this.itemStatus = itemStatus; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.refSrc = refSrc; + this.organizeCode =organizeCode; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + this.fixId = fixId; + } + + public WmsMoveMasterSnapshot(Long id, String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, String refSrc, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { + this.id = id; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcWhNo = srcWhNo; + this.srcZoneNo = srcZoneNo; + this.destWhNo = destWhNo; + this.destZoneNo = destZoneNo; + this.transQty = transQty; + this.rejectQty = rejectQty; + this.fixId = fixId; + this.busiTypeCode = busiTypeCode; + this.refSrc = refSrc; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyUser =modifyUser; + this.modifyDatetime =modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java new file mode 100644 index 0000000..6f781aa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsMoveSnSnapshot.java @@ -0,0 +1,265 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : 库存移动单条码信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_MOVE_SN_SNAPSHOT", indexes = { + @Index(columnList = "PART_NO"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "SN"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +@Api("库存移动单条码信息") +public class WmsMoveSnSnapshot extends BaseBean { + + private static final long serialVersionUID = 2588101374261238353L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + public String unit; + + @Column(name = "SN") + @ApiParam("条码") + public String sn; + + @Column(name = "CSN") + @ApiParam("客户条码") + public String csn; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer itemStatus; + + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; + + @Column(name = "LOT_NO") + @ApiParam("批次编号") + public String lotNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("容器编号") + public String packAgeNo; + + @Column(name = "SRC_QTY") + @ColumnDefault("0") + @ApiParam(value = "源数量", example = "0") + public Double srcQty; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; + + @ApiParam("待上架箱数") + @Transient + private Long waitingCounts; + + @ApiParam("已上架箱数") + @Transient + private Long finishedCounts; + + @Column(name = "DEST_QTY") + @ColumnDefault("0") + @ApiParam(value = "目标数量", example = "0") + public Double destQty; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + @Column(name = "SRC_QC_STATUS") + @ApiParam(value = "源质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + public Integer srcQcStatus; + + @Column(name = "SRC_SN_STATUS") + @ApiParam(value = "源条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + public Integer srcSnStatus; + + @Column(name = "DEST_QC_STATUS") + @ApiParam(value = "目的质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") + public Integer descQcStatus; + + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "目的条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") + public Integer destSnStatus; + + @Column(name = "DATE_CODE") + @ApiParam("生产日期") + public String dateCode; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + public String fixLotNo; + + @Column(name = "VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Transient + @ApiParam("业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private Integer busiTypeCode; + + @Transient + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Transient + @ApiParam("关联单号") + public String refSrc; + + @Transient + @ApiParam("erp库存地") + private String ZoneNo; + + @Transient + @ApiParam("交易类型名称") + private String transTypeName; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + + public WmsMoveSnSnapshot() { + } + + public WmsMoveSnSnapshot(String partNo, Long finishedCounts, Long waitingCounts) { + this.partNo = partNo; + this.waitingCounts = waitingCounts; + this.finishedCounts = finishedCounts; + } + + public Long getWaitingCounts() { + return waitingCounts == null ? 0L : this.waitingCounts; + } + + public Long getFinishedCounts() { + return finishedCounts == null ? 0L : this.finishedCounts; + } + + public WmsMoveSnSnapshot(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.busiTypeCode = busiTypeCode; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } + + public WmsMoveSnSnapshot(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.destQty = destQty; + this.transTypeCode = transTypeCode; + this.refSrc = refSrc; + } + + public WmsMoveSnSnapshot(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java new file mode 100644 index 0000000..dddfab4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockQuanSnapshot.java @@ -0,0 +1,292 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.util.List; + +/** + * @Description : 库存信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-02 11:06 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_STOCK_QUAN_SNAPSHOT", indexes = { + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "库存信息", description = "库存信息") +public class WmsStockQuanSnapshot extends BaseBean { + + private static final long serialVersionUID = 8335719859185712904L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Transient + @ApiParam(value = "项目代码") + private String prodCfgTypeCode; + + @Transient + @ApiParam(value = "含0库存显示") + private Boolean includeZeroStock = false; + + @Transient + @ColumnDefault("0") + @ApiParam(value = "库存数量总和") + private Double sumQty; + + @Transient + @ApiParam(value = "库位信息") + private WmsLocate wmsLocate; + + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "可用数量", example = "0") + public Double qty; + + @Column(name = "FAIL_QTY") + @ColumnDefault("0") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + + @Column(name = "HOLD_QTY") + @ColumnDefault("0") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ColumnDefault("0") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ColumnDefault("0") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ColumnDefault("0") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ColumnDefault("0") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ColumnDefault("0") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; + + @Column(name = "SCRAP_QTY") + @ColumnDefault("0") + @ApiParam(value = "报废数量", example = "0") + private Double scrapQty; + + @Transient + @ApiParam(value = "总数量") + private Double totalQty; + + @Transient + @ApiParam(value = "项目名称") + private String prodCfgTypeName; + + @Transient + @ApiParam(value = "箱数", example = "-1") + private Integer boxQty; + + @Transient + @ApiParam(value = "零件数", example = "-1") + private Double partQty; + + @Transient + @ApiParam(value = "ERP库存地") + private String areaNo; + + @Transient + @ApiParam(value = "存储区集合") + private List zoneList; + + @Transient + @ApiParam(value = "移动单条码集合") + private List wmsMoveSnList; + + + public String getAreaNo() { + return areaNo; + } + + public Double getQtyVal() { + return this.qty == null ? 0 : this.qty; + } + + public Double getFailQtyVal() { + return this.failQty == null ? 0 : this.failQty; + } + + public Double getHoldQtyVal() { + return this.holdQty == null ? 0 : this.holdQty; + } + + public Double getQcQtyVal() { + return this.qcQty == null ? 0 : this.qcQty; + } + + public Double getRinQtyVal() { + return this.rinQty == null ? 0 : this.rinQty; + } + + public Double getFreezeQtyVal() { + return this.freezeQty == null ? 0 : this.freezeQty; + } + + public Double getConsignQtyVal() { + return this.consignQty == null ? 0 : this.consignQty; + } + + public Double getLockQtyVal() { + return this.lockQty == null ? 0 : this.lockQty; + } + + public Double getScrapQtyVal() { + return this.scrapQty == null ? 0 : this.scrapQty; + } + + public Double getTotalVal() { + return this.totalQty == null ? 0 : this.totalQty; + } + + public Double getPartQtyVal() { + return this.partQty == null ? 0 : this.partQty; + } + + public Integer getBoxQtyVal() { + return this.boxQty == null ? 0 : this.boxQty; + } + + public WmsStockQuanSnapshot() { + } + + public WmsStockQuanSnapshot(String whNo, String zoneNo, String unit, String partNo, String partName, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, + Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partName; + this.unit = unit; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.prodCfgTypeCode = prodCfgTypeCode; + this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; + } + + public WmsStockQuanSnapshot(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } + + public WmsStockQuanSnapshot(String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, + Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.sumQty = sumQty; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } + + public WmsStockQuanSnapshot(String whNo, String zoneNo, String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.boxQty = boxQty; + this.partQty = partQty; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + this.scrapQty = scrapQty; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java new file mode 100644 index 0000000..436d126 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsStockSnSnapshot.java @@ -0,0 +1,268 @@ +package cn.estsh.i3plus.pojo.wms.bean.snapshot; + +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 org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +/** + * @Description : 库存条码信息 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-17 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_STOCK_SN_SNAPSHOT", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "REF_SRC"), + @Index(columnList = "SN"), + @Index(columnList = "SN_2D"), + @Index(columnList = "WH_NO"), + @Index(columnList = "ZONE_NO"), + @Index(columnList = "LOCATE_NO"), + @Index(columnList = "LOT_NO"), + @Index(columnList = "FIX_LOT_NO"), + @Index(columnList = "DATE_CODE"), + @Index(columnList = "VENDOR_NO"), + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "SNAPSHOT_TIME") + }) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "库存条码信息", description = "库存条码信息") +public class WmsStockSnSnapshot extends BaseBean { + + private static final long serialVersionUID = 8641922373097608315L; + + @Column(name="SNAPSHOT_TIME") + @ApiParam("快照时间") + public String snapshotTime; + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货日期（批次编码）") + public String lotNo = ""; + + @Column(name = "DATE_CODE", nullable = false) + @ApiParam(value = "生产日期") + public String dateCode = ""; + + @Column(name = "LEFT_CODE", nullable = false) + @ApiParam(value = "有效期") + private String leftCode = ""; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "FIX_LOT_NO", nullable = false) + @ApiParam(value = "特殊批次") + private String fixLotNo = ""; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "SN_2D") + @ApiParam(value = "二维码") + private String sn2d; + + @Column(name = "PACKAGE_NO") + @ApiParam(value = "包装编号") + private String packageNo; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "数量", example = "0") + private Double qty = 0d; + + /** + * 质量状态:10=合格,20=不合格,30=隔离 + */ + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + private Integer qcStatus; + /** + * 条码状态：1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途 + */ + @Column(name = "SN_STATUS") + @ApiParam(value = "条码状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + private Integer snStatus; + /** + * 1:已打印；2：未打印 + */ + @Column(name = "PRINTED") + @ApiParam(value = "是否打印", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + private Integer printed; + + @Column(name = "PDATE") + @ApiParam(value = "打印时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date pdate; + /** + * 1=ASN,10=PO,20=SO + */ + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单号") + private String refSrc; + + @Column(name = "CUST_SN") + @ApiParam(value = "客户条码") + private String custSn; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description") + private Integer snType = 10; + + @ApiParam(value = "仓库名称") + @Transient + public String whNameRdd; + + @ApiParam(value = "存储区名称") + @Transient + public String zoneNameRdd; + + @ApiParam(value = "库位名称") + @Transient + public String locateNameRdd; + + @ApiParam(value = "物料类型描述") + @Transient + public String partTypeDesc; + + @ApiParam(value = "客户名称") + @Transient + public String custNameRdd; + + @ApiParam(value = "供应商名称") + @Transient + public String vendorNameRdd; + + @ApiParam(value = "二维码内容") + @Transient + public String barCode; + + @ApiParam(value = "散件质检输入不良数量") + @Transient + public Double inputNCQty; + + @ApiParam(value = "前端散件表格是否编辑") + @Transient + public Boolean isSet = false; + + @ApiParam(value = "加减库容标志") + @Transient + public Boolean isAdd; + + @ApiParam(value = "项目名称") + @Transient + public String prodCfgTypeName; + + @ApiParam(value = "标签编号") + @Transient + public String labelNo; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + + @Transient + @ApiParam(value = "物料数量总和") + public Double sumPartQty; + + @Transient + @ApiParam(value = "条码数量总和") + public Long snCount; + + @Transient + @ApiParam(value = "物料编码集合") + public List partNoList; + + @Transient + @ApiParam(value = "ERP库存地集合") + public List erpZoneNoList; + + @Transient + @ApiParam(value = "ERP库存地") + public String erpZoneNo; + + @Transient + @ApiParam(value = "目标数量") + public Double destQty; + + public WmsStockSnSnapshot(){} + + public WmsStockSnSnapshot(String partNo){ + this.partNo = partNo; + } + + public Integer getSnType() { return snType == null ? 0 : snType.intValue();} + + public Double getQty() { + return qty == null ? 0L : qty.doubleValue(); + } + + public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} + + public WmsStockSnSnapshot(Long snCount, Double sumPartQty, String locateNo) { + this.snCount = snCount; + this.sumPartQty = sumPartQty; + this.locateNo = locateNo; + } +} From f5d2398e0e87bd371eb123e618f81fe9523fac01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Sep 2019 15:08:49 +0800 Subject: [PATCH 55/63] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7--=E5=BC=80=E5=8F=A3?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/{iotio => }/SwebProcurementPlanOrder.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ .../pojo/wms/repository/SwebProcurementPlanOrderRepository.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/{iotio => }/SwebProcurementPlanOrder.java (89%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java similarity index 89% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index 1b43c58..34116e8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.iotio; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -49,4 +49,8 @@ public class SwebProcurementPlanOrder extends BaseBean { @ApiParam(value = "物料名称") private String partName; + @Column(name = "CONSIGNMENT") + @ApiParam(value = "是否寄售") + private Integer consignment; + } 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 1c1dbdc..20705ab 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 @@ -143,6 +143,10 @@ public class WmsPart extends BaseBean { @ApiParam("结算供应商") private String outCloseVendor; + @Column(name = "QUALITY_DAYS") + @ApiParam("保质期天数") + private Integer qualityDays; + @Transient @ApiParam("总数量") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java index 130a355..6b6a05e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.wms.bean.iotio.SwebProcurementPlanOrder; +import cn.estsh.i3plus.pojo.wms.bean.SwebProcurementPlanOrder; import org.springframework.stereotype.Repository; /** From 2c6b223628a238a09dc1c6fc86dc1f7f99fb3ab8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 15:57:07 +0800 Subject: [PATCH 56/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 202 ++++++++++++--------- .../pojo/model/softswitch/BsSuitCaseModel.java | 13 +- .../{SuitCoreModel.java => SuitClientModel.java} | 73 +++----- .../pojo/softswitch/bean/BsSuitCaseParam.java | 4 + 4 files changed, 155 insertions(+), 137 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/{SuitCoreModel.java => SuitClientModel.java} (56%) 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 2c17fa4..b1d8e56 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 @@ -3,6 +3,9 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description : 软适配 枚举接口 * @Reference : @@ -20,9 +23,9 @@ public class BlockSoftSwitchEnumUtil { SOCKET(10,"SOCKET"), RESTFUL(20,"RESTFUL"), DATASOURCE(30,"数据源"), - WEBSERVICE(40,"WebService"), + WEB_SERVICE(40,"WebService"), MQ(50,"消息队列"), - WebSocket(60,"WebSocket"); + WEB_SOCKET(60,"WebSocket"); private int value; private String description; @@ -62,13 +65,123 @@ public class BlockSoftSwitchEnumUtil { } /** + * 适配模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_MODE{ + CLIENT(1,"客户端"), + SERVER(2,"服务端"); + + private int value; + private String description; + + SUIT_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; + } + } + + /** + * 软适配命令集合 + * + *
ID 编号规则 + *
第一位 服务端或者客户端 1 或者 2 + *
第二至三位 适配类型编号 + *
后三位 适配器ID升序 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SOFTS_WITCH_ACTION{ + /* WebService */ + SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"), + CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), + + /* 数据源 */ + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"); + + private int value; + private String description; + private String clazzName; + private SUIT_MODE mode; + private CASE_TYPE type; + + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) { + this.value = value; + this.description = description; + this.clazzName = clazzName; + this.mode = mode; + this.type = type; + } + + public static SOFTS_WITCH_ACTION 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 SOFTS_WITCH_ACTION[] valueOfCaseType(CASE_TYPE type) { + List result = new ArrayList<>(); + for (int i = 0; i < values().length; i++) { + if (values()[i].type.equals(type)) { + result.add(values()[i]); + } + } + return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getClazzName() { + return clazzName; + } + + public SUIT_MODE getMode() { + return mode; + } + + public CASE_TYPE getType() { + return type; + } + } + + /** * 请求来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REQUEST_SOURCE{ ACTIVE(1,"主动请求"), SCHEDULE(2,"定时调度"), - RABBITMQ(3,"MQ 调用"); + RABBITMQ(3,"MQ 调用"), + HTTP(4,"接口调用"), + CLOUD(5,"Cloud调用"); private int value; private String description; @@ -385,41 +498,6 @@ public class BlockSoftSwitchEnumUtil { } /** - * 适配模式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_MODE{ - CLIENT(1,"客户端"), - SERVER(2,"服务端"); - - private int value; - private String description; - - SUIT_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; - } - } - - /** * 适配方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -489,52 +567,4 @@ public class BlockSoftSwitchEnumUtil { } } - /** - * WebService Server 服务端命令 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_SERVER_WEB_SERVICE{ - SCHEDULE(40001,"serverWebServiceSendEmail","邮件测试",SUIT_MODE.SERVER), - ACTIVE(40002,"softswitchClient","软适配服务邮件服务",SUIT_MODE.CLIENT); - - private int value; - private String description; - private String clazzName; - private SUIT_MODE mode; - - SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description,SUIT_MODE mode) { - this.value = value; - this.clazzName = clazzName; - this.description = description; - this.mode = mode; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getClazzName() { - return clazzName; - } - - public SUIT_MODE getMode() { - return mode; - } - - 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-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 6b33f85..cb95189 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.model.softswitch; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; @@ -9,7 +7,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 适配器model @@ -19,7 +17,8 @@ import javax.persistence.Transient; * @Modify: **/ @Data -public class BsSuitCaseModel { +public class BsSuitCaseModel implements Serializable { + private static final long serialVersionUID = -7420782744192475445L; @ApiParam(value = "适配器") private BsSuitCase bsSuitCase; @@ -32,4 +31,10 @@ public class BsSuitCaseModel { @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + public BsSuitCaseModel() { + } + + public BsSuitCaseModel(BsSuitCase bsSuitCase) { + this.bsSuitCase = bsSuitCase; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java similarity index 56% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 2283d83..b668b4f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamOmitField; +import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; - /** * @Description : * @Reference : @@ -21,89 +18,74 @@ import javax.persistence.Transient; **/ @Data @XStreamAlias("model") -public class SuitCoreModel { +public class SuitClientModel { /** * 适配套件代码 */ @XStreamAsAttribute - private String suitCaseCode;// adapterId + private String suitCaseCode; + + @ApiParam(value = "套件类型(枚举)") + @XStreamAsAttribute + private Integer caseTypeId; + + @ApiParam(value = "适配命令(枚举)") + private Integer suitServerActionId; /** - * 套件类型 + * 适配器信息 */ - @XStreamAsAttribute - private Integer caseType; + private BsSuitCaseModel suitCaseModel; /** * 适配结果信息 */ private String suitMessage; - /** * 请求来源 */ private Integer requestSource; - - private String suitCaseStatusCode; - /** - * 适配认证 + * 适配状态码 */ - private BsSslKey sslKey; - + private String suitCaseStatusCode; /** * 认证令牌 */ private String token; - - /** - * 适配器套件 - */ - private BsSuitCase bsSuitCase; - - private Object bsSuitCaseDetail; - /** * 认证结果 */ private Integer suitSslKeyResult; - /** * 认证信息 */ private String suitSslKeyResultMessage; - /** * 适配结果 */ private Integer suitResult; - /** * 适配报文 */ @XStreamCDATA private String suitResultMessage; - /** - * @param requestSource 请求来源 - * @param sslKey 适配认证对象 - * @param bsSuitCase 适配器信息 - */ - public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){ - this(requestSource,sslKey, bsSuitCase,null); + public SuitClientModel() { } - public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) { - this.sslKey = sslKey; - this.bsSuitCase = bsSuitCase; + public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) { + new SuitClientModel(source.getValue(),suitCaseModel); + } + + public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; - this.bsSuitCaseDetail = bsSuitCaseDetail; - // 设置套件类型 - this.caseType = bsSuitCase.getCaseTypeId(); - // 设置套件代码 - this.suitCaseCode = bsSuitCase.getSuitCaseCode(); + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId(); + this.suitCaseModel = suitCaseModel; + // 设置默认 this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); // 设置默认 @@ -111,7 +93,4 @@ public class SuitCoreModel { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } -} - - - +} \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 148494f..0c4f5b1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -51,6 +51,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值类型") private Integer paramValTypeId; + @Column(name = "PARAM_SORT") + @ApiParam(value = "参数参数排序") + private Integer paramSort; + @Column(name = "PARAM_DEFAULT_VALUE") @ApiParam(value = "参数默认值") private String paramDefaultValue; From 8b0e851eb8071ebe1ed4310a447ade135a473989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Sep 2019 15:58:29 +0800 Subject: [PATCH 57/63] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 4 ++++ .../cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 6b33f85..9d3f049 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; @@ -29,7 +30,10 @@ public class BsSuitCaseModel { @ApiParam(value = "socket适配套件") private BsSocketSuitCase bsSocketSuitCase; + @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + @ApiParam(value = "分页数据") + private Pager pager; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 629fcf7..71d1c59 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -118,6 +118,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsParamAdapter.orderBy()); From fc1c7ab797483670c1298d007cd2caf1484eed21 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 16:06:51 +0800 Subject: [PATCH 58/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0-=E6=89=80=E6=9C=89=E9=80=82=E9=85=8D=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 10 ++++++++++ .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) 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 b1d8e56..cc6a524 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 @@ -151,6 +151,16 @@ public class BlockSoftSwitchEnumUtil { return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); } + public static SOFTS_WITCH_ACTION[] valueOfMode(SUIT_MODE mode) { + List result = new ArrayList<>(); + for (int i = 0; i < values().length; i++) { + if (values()[i].mode.equals(mode)) { + result.add(values()[i]); + } + } + return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); + } + public int getValue() { return value; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index b78b66f..d0a336e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -19,8 +19,6 @@ public class SuitServerModel { // 执行方法命令 private String action; - // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE) - private Integer caseType; /* 认证使用 以后使用 */ private String token; // 传输单对象 From 377a875fec1df8806f35f5b93be756740f01b7ef Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 16:31:06 +0800 Subject: [PATCH 59/63] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 cc6a524..5fe61aa 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 @@ -115,7 +115,10 @@ public class BlockSoftSwitchEnumUtil { CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), /* 数据源 */ - CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"); + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"), + + /* Restful */ + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index bb4e11e..3b7894c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; From 40a2a789bee7a8963b27fe37a84b5a10757cb8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Sep 2019 17:00:45 +0800 Subject: [PATCH 60/63] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 3b7894c..77b0134 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -25,7 +25,7 @@ public class BsSuitCaseModel implements Serializable { private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - private BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsSuitCaseDataSource; @ApiParam(value = "socket适配套件") private BsSocketSuitCase bsSocketSuitCase; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 71d1c59..9377c97 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -116,7 +116,6 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean); From 59569cef66185f6fc97a6602067788f373ce1762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Sep 2019 15:01:58 +0800 Subject: [PATCH 61/63] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E6=8E=89=E4=B9=90=E8=A7=82=E9=94=81=EF=BC=88?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=94=99=E8=AF=AF=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?JOB=E4=B8=80=E4=B8=AA=E4=BA=8B=E5=8A=A1=E5=86=85=E5=AF=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A1=A8=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E6=AC=A1=E6=93=8D=E4=BD=9C=E4=B8=8D=E8=A1=8C=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=8E=A5=E6=8C=82=E6=8E=89?= =?UTF-8?q?=EF=BC=8C=E4=BA=8B=E5=8A=A1=E4=B9=9F=E6=B2=A1=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=EF=BC=89+=20=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=88=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93=EF=BC=89?= =?UTF-8?q?=EF=BC=9A=E5=BE=85=E5=85=A5=E5=BA=93=E7=9A=84=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E5=90=88=E6=A0=BC=E7=9A=84+=20=E5=85=AC?= =?UTF-8?q?=E5=85=B1PDA=E7=BB=84=E4=BB=B6=E6=8A=9B=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=80=BC=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 0ffaeb3..08bd2ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -144,10 +144,10 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; public WmsMoveMaster(){}; From 51974a46b938f875b17578b5b6e7a57bc3c5dae4 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 12 Sep 2019 16:16:52 +0800 Subject: [PATCH 62/63] =?UTF-8?q?WebService=20=E8=B0=83=E7=94=A8=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 16 ++++++++++++---- .../i3plus/pojo/model/softswitch/SoftswitchIocModel.java | 16 ++++++++++++++++ .../i3plus/pojo/model/softswitch/SuitClientModel.java | 13 ++++++------- .../i3plus/pojo/model/softswitch/SuitServerModel.java | 15 +++++++++++++-- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 4 ++-- 5 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java 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 5fe61aa..b387a47 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 @@ -111,14 +111,15 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFTS_WITCH_ACTION{ /* WebService */ - SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"), - CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), + SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), + SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), + CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), /* 数据源 */ - CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"), + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), /* Restful */ - CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test"); + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"); private int value; private String description; @@ -126,6 +127,13 @@ public class BlockSoftSwitchEnumUtil { private SUIT_MODE mode; private CASE_TYPE type; + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String description) { + this.value = value; + this.description = description; + this.mode = mode; + this.type = type; + } + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) { this.value = value; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java new file mode 100644 index 0000000..596233a --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/12 下午2:00 + * @Modify: + **/ +@Data +public class SoftswitchIocModel { + private String beanName; + private Object obj; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index b668b4f..88ab98d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -9,6 +9,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.HashMap; + /** * @Description : * @Reference : @@ -17,7 +19,7 @@ import lombok.Data; * @Modify: **/ @Data -@XStreamAlias("model") +@XStreamAlias("client") public class SuitClientModel { /** @@ -31,7 +33,7 @@ public class SuitClientModel { private Integer caseTypeId; @ApiParam(value = "适配命令(枚举)") - private Integer suitServerActionId; + private Integer actionId; /** * 适配器信息 @@ -75,15 +77,12 @@ public class SuitClientModel { public SuitClientModel() { } - public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) { - new SuitClientModel(source.getValue(),suitCaseModel); - } - public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); - this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId(); + this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId(); + this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode(); this.suitCaseModel = suitCaseModel; // 设置默认 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index d0a336e..fb0d0aa 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -14,11 +15,12 @@ import java.util.Map; * @Modify: **/ @Data -@XStreamAlias("model") +@XStreamAlias("server") public class SuitServerModel { // 执行方法命令 - private String action; + @ApiParam(value = "适配命令(枚举)") + private Integer actionId; /* 认证使用 以后使用 */ private String token; // 传输单对象 @@ -30,4 +32,13 @@ public class SuitServerModel { // 传输 JSON 数据 private String json; + /** + * 适配结果信息 + */ + private String suitMessage; + /** + * 适配状态码 + */ + private String suitCaseStatusCode; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 61e7853..eba3850 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -75,9 +75,9 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; - @Column(name = "SUIT_SERVER_ACTION_ID") + @Column(name = "SUIT_ACTION_ID") @ApiParam(value = "Server 适配命令") - private Integer suitServerActionId; + private Integer suitActionId; @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") From 510485d2f09a7e2eadac0ef47049afa9c548377c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 12 Sep 2019 17:19:46 +0800 Subject: [PATCH 63/63] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?--=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 6 ++++++ 3 files changed, 10 insertions(+), 4 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 79ce1a2..457b27d 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; @@ -66,8 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(hidden = true) - //启用停用 + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 0354924..67c14bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -79,8 +79,8 @@ public class WmsCSOrderMaster extends BaseBean { public String year; @Column(name = "IS_SYNC_ERP") - @ApiParam("是否同步ERP: 1=已同步，2=未同步") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_ERP_SYNC_FLAG.class,refForeignKey = "value",value = "description") + @ApiParam("是否同步ERP") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isSyncErp; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index f0201cb..a137f31 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -1,6 +1,8 @@ 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; @@ -56,6 +58,7 @@ public class WmsTaskInfo extends BaseBean { */ @Column(name = "TASK_STATUS") @ApiParam(value = "任务状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TASK_INFO_STATUS.class,refForeignKey = "value",value = "description") public Integer taskStatus; @Column(name = "TRANS_TYPE_CODE") @@ -68,10 +71,12 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法操作") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isOneStep; @ApiParam("作业类型名称") @Transient + @AnnoOutputColumn(refClass = WmsEnumUtil.OP_TYPE_CODE.class,refForeignKey = "value",value = "description") public String opTypeName; @ApiParam("作业任务明细") @@ -80,6 +85,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_CHECK_SN") @ApiParam("是否校验条码") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isCheckSn; @Transient