Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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")

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);
     }
 }