From 6da4a6f33cdc9375398be2a899a6108deb536cd0 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sun, 28 Apr 2019 10:04:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9B=B8=E5=85=B3=E7=9A=84=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 38 ++++++++++++++++++++++ .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 +++++++++ 2 files changed, 54 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java new file mode 100644 index 0000000..d6549d0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java new file mode 100644 index 0000000..c91b713 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} From 15a399e86d12eca0d1763584d5a6c9d26166b26c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sun, 28 Apr 2019 10:52:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E3=80=81=E6=8A=BD=E7=82=B9=E8=AE=B0=E5=BD=95=E3=80=81=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E4=B8=89=E5=BC=A0=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) 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 d92af1f..e479c0f 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 @@ -598,25 +598,25 @@ public class WmsHqlPack { * @param wmsShopping * @return */ - public static String packHqlWmsShipping(WmsShopping wmsShopping) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) { + DdlPackBean result = new DdlPackBean(); //发运单号 - HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 - HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 - HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 - HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 - HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); getStringBuilderPack(wmsShopping, result); - return result.toString(); + return result; } /** @@ -1058,21 +1058,21 @@ public class WmsHqlPack { * @param wmsQCMaster * @return */ - public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); - return result.toString(); + return result; } /** @@ -1121,15 +1121,15 @@ public class WmsHqlPack { * @param wmsQCDetails * @return */ - public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCDetails, result); - return result.toString(); + return result; } /** @@ -1138,16 +1138,16 @@ public class WmsHqlPack { * @param wmsQCTrans * @return */ - public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); //物料 - HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsQCTrans, result); - return result.toString(); + return result; } /**