bug 修改

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -186,4 +186,8 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Transient
     @ApiParam(value = "关联单号")
     private String refOrderNo;
+
+    @Transient
+    @ApiParam(value = "条码")
+    private String barCode;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -74,7 +74,7 @@ public class SwebHqlPack {
 
 
     // DdlPackBean方法中的 getNumNOEqualPack（） 方法存在问题，所有先用  HqlPack
-    public static String getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
+    public static String getPurchaseOrderDetailsWhereHqlByItemStatus(SwebPOForPubListEnterModel model) {
         StringBuffer result = new StringBuffer();
         HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.CREATE.getValue(),"itemStatus",result);
         HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result);
@@ -91,6 +91,19 @@ public class SwebHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result);
+        DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result);
+        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result);
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(model, result);
+    }
+
     public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);