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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java

@@ -55,7 +55,7 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
     private String resourceKey;
 
-    @Column(name="resource_value")
+    @Column(name="resource_value",columnDefinition="TEXT")
     @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
     private String resourceValue;
 

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

@@ -50,10 +50,6 @@ public class SwebPurchaseOrder extends BaseBean {
     @Column(name = "ORDER_TYPE")
     private Integer orderType;
 
-    @ApiParam(value = "订单状态", example = "1")
-    @Column(name = "ORDER_STATUS")
-    private Integer orderStatus;
-
     @Column(name = "PARENT_PACKAGE_NO")
     @ApiParam("上级包装编号")
     private String parentPackageNo;

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.SwebEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.sweb.bean.*;
 import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel;
@@ -46,7 +47,6 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
-        DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                 purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
@@ -139,4 +139,16 @@ public class SwebHqlPack {
         DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
         return buildHql(details, result);
     }
+
+    /**
+     * 判断订单详情表是否有非新建状态的订单 where sql
+     * @param details
+     * @return
+     */
+    public static DdlPackBean getPODetailsNotCreateStatusWhereHql(SwebPurchaseOrderDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
+        return buildHql(details, result);
+    }
 }