From 55b07e8e75fbdceb5d4b742dc7569b9ed4edb5ab Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 28 Nov 2019 14:45:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1256=20=E5=B7=A5=E5=BA=8Fbom=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B7=A5=E4=BD=8Dbom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{MesProcessBom.java => MesStationBom.java} | 23 ++++--------- .../{ProcessBomModel.java => StationBomModel.java} | 6 ++-- ...epository.java => MesStationBomRepository.java} | 4 +-- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 16 ++++----- .../{MesProcessBom.java => MesStationBom.java} | 23 +++---------- ...epository.java => MesStationBomRepository.java} | 4 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 40 +++++++++++++++------- 7 files changed, 54 insertions(+), 62 deletions(-) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/{MesProcessBom.java => MesStationBom.java} (91%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/{ProcessBomModel.java => StationBomModel.java} (78%) rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesProcessBomRepository.java => MesStationBomRepository.java} (65%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesProcessBom.java => MesStationBom.java} (90%) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesProcessBomRepository.java => MesStationBomRepository.java} (66%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java similarity index 91% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 8ac4a33..284358c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -27,9 +27,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS_BOM") +@Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesProcessBom extends BaseBean { +public class MesStationBom extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -46,14 +46,6 @@ public class MesProcessBom extends BaseBean { @ApiParam("工作单元") private String workCellCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; @@ -67,10 +59,6 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "子零件数量", example = "0") private Double qty; - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") private Integer isRepeat; @@ -83,11 +71,15 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + + @Transient @ApiParam("是否已绑定") private Boolean isBind; @@ -131,7 +123,6 @@ public class MesProcessBom extends BaseBean { public String toString() { return "MesProcessBom{" + "partNo='" + partNo + '\'' + - ", processCode='" + processCode + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + ", isRepeat=" + isRepeat + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java similarity index 78% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java index 9708b49..e894595 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.model; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -16,8 +16,8 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -@Api("工序BOM model") -public class ProcessBomModel extends MesProcessBom { +@Api("工位BOM model") +public class StationBomModel extends MesStationBom { @ApiParam("上料数量") private Long cellFeedQty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java similarity index 65% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java index ac3d741..f5fd71f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessBomRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java @@ -1,7 +1,7 @@ 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.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStationBom; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesProcessBomRepository extends BaseRepository { +public interface MesStationBomRepository extends BaseRepository { } 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 8b6ac75..64e9d61 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 @@ -98,17 +98,17 @@ public class MesHqlPack { /** * 获取原材料扫描信息的对应工序BOM * - * @param mesProcessBom - * @param mesRawPartSn + * @param stationBom + * @param rawPartSn * @return */ - public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) { - DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); - DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java similarity index 90% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 58f0644..233bf70 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -9,13 +9,11 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Date; /** * @Description :工序物料清单 @@ -29,9 +27,9 @@ import java.util.Date; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS_BOM") +@Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesProcessBom extends BaseBean { +public class MesStationBom extends BaseBean { @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -48,15 +46,6 @@ public class MesProcessBom extends BaseBean { @ApiParam("工作单元") private String workCellCode; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - @Column(name = "ITEM_PART_NO") @ApiParam("子零件") private String itemPartNo; @@ -69,10 +58,6 @@ public class MesProcessBom extends BaseBean { @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") @@ -99,6 +84,9 @@ public class MesProcessBom extends BaseBean { @ApiParam("显示颜色") private String color; + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; @@ -124,7 +112,6 @@ public class MesProcessBom extends BaseBean { public String toString() { return "MesProcessBom{" + "partNo='" + partNo + '\'' + - ", processCode='" + processCode + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + ", isRepeat=" + isRepeat + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java similarity index 66% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java index 5be4ef2..baa7d28 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStationBomRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesProcessBom; +import cn.estsh.i3plus.pojo.mes.bean.MesStationBom; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesProcessBomRepository extends BaseRepository { +public interface MesStationBomRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index cb22a95..23d69d6 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 @@ -746,25 +746,24 @@ public class MesHqlPack { /** * MES工序BOM信息查询条件封装 * - * @param processBom + * @param stationBom * @return */ - public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); - DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean); - DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean); + public static DdlPackBean getStationBom(MesStationBom stationBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(stationBom, organizeCode); + DdlPreparedPack.getStringLikerPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(stationBom.getItemPartNo(), "itemPartNo", packBean); return packBean; } - public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) { + public static DdlPackBean getStationBomExcludeById(MesStationBom stationBom, String org) { DdlPackBean packBean = getAllBaseData(org); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean); - DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getItemPartNo(), "itemPartNo", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumEqualPack(stationBom.getIsFeed(), "isFeed", packBean); + DdlPreparedPack.getNumNOEqualPack(stationBom.getId(), "id", packBean); return packBean; } @@ -1621,6 +1620,7 @@ public class MesHqlPack { /** * 对象结构 + * * @param mesObjectCfg * @param organizeCode * @return @@ -1644,6 +1644,7 @@ public class MesHqlPack { /** * 数据对象 + * * @param mesDataObject * @param organizeCode * @return @@ -1667,6 +1668,7 @@ public class MesHqlPack { /** * 产品包装关系 + * * @param mesProdPack * @param organizeCode * @return @@ -1693,6 +1695,7 @@ public class MesHqlPack { /** * 产品编码配置 + * * @param mesProductEncodeCfg * @param organizeCode * @return @@ -1716,6 +1719,7 @@ public class MesHqlPack { /** * 客户订单 + * * @param mesCustOrder * @param organizeCode * @return @@ -1756,6 +1760,7 @@ public class MesHqlPack { /** * 模板配置 + * * @param mesLabelTemplate * @param organizeCode * @return @@ -1773,6 +1778,7 @@ public class MesHqlPack { /** * 关键动作 + * * @param mesKeyAction * @param organizeCode * @return @@ -1796,6 +1802,7 @@ public class MesHqlPack { /** * 动作接口配置 + * * @param mesActionIf * @param organizeCode * @return @@ -1813,6 +1820,7 @@ public class MesHqlPack { /** * 接口清单 + * * @param mesIf * @param organizeCode * @return @@ -1836,6 +1844,7 @@ public class MesHqlPack { /** * 过程条码报表 + * * @param mesProduceSn * @param organizeCode * @return @@ -1872,6 +1881,7 @@ public class MesHqlPack { /** * 物料追溯 + * * @param mesProdBindRecord * @param organizeCode * @return @@ -1914,6 +1924,7 @@ public class MesHqlPack { /** * 物料追溯 + * * @param ifPackageDetail * @param organizeCode * @return @@ -1935,6 +1946,7 @@ public class MesHqlPack { /** * 维修记录 + * * @param mesRepairRecord * @param organizeCode * @return @@ -1971,6 +1983,7 @@ public class MesHqlPack { /** * 过程质量检测数据 + * * @param mesQcCheckData * @param organizeCode * @return @@ -2001,6 +2014,7 @@ public class MesHqlPack { /** * 条码履历报表 + * * @param mesProduceSnTravel * @param organizeCode * @return From 91ec41b3c0f4d01eb32430b599da0ab62b891417 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 28 Nov 2019 16:45:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=8E=89=E7=B4=A2=E5=BC=95=E4=BF=A1=E6=81=AF=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/bean/WmsTransQuan.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/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index d5e6146..651b336 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -23,13 +23,13 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_TRANS_QUAN", indexes = { +@Table(name = "WMS_TRANS_QUAN"/*, indexes = { @Index(columnList = "WH_NO"), @Index(columnList = "ZONE_NO"), @Index(columnList = "LOCATE_NO"), @Index(columnList = "REF_SRC"), @Index(columnList = "ORGANIZE_CODE") -}) +}*/) @Api("库存交易信息") public class WmsTransQuan extends BaseBean { From c8f23ba640d72ed6f2acf962e04c26cb5423a245 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 28 Nov 2019 16:46:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=09=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95=E7=9C=8B=E5=88=B0=E5=AF=84?= =?UTF-8?q?=E5=94=AE=E9=9B=B6=E4=BB=B6=E3=80=91=E3=80=90bug6331=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 6 +----- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index a138300..338d1d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -42,7 +42,7 @@ public class SwebProcurementPlanOrder extends BaseBean { private String vendorName; @Column(name = "PART_NO") - @ApiParam(value = "物料名称") + @ApiParam(value = "物料编号") private String partNo; @Column(name = "PART_NAME") @@ -53,8 +53,4 @@ public class SwebProcurementPlanOrder extends BaseBean { @ApiParam(value = "是否寄售") private Integer consignment=2; - @Column(name = "organize_code") - @ApiParam(value = "组织代码") - private String organizeCode; - } 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 9b00052..d823254 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 @@ -163,8 +163,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); - DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean);