From b4f07905e5910c0eba7f2841d1de18a815208c57 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 14 May 2019 17:34:48 +0800 Subject: [PATCH] =?UTF-8?q?sweb=20=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8C=89=E5=A4=A9=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 5 +---- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index eb78593..d075fdf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -66,11 +66,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; - /** - * 不冗余主表数据 - */ @ApiParam(value = "行项目状态", example = "1") - @Transient + @Column(name = "ITEM_STATUS") private Integer itemStatus; @Column(name = "BOX_QTY") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 93f65f4..80c33a0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -115,16 +115,15 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); return buildHql(details, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); return buildHql(details, result); } }