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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -88,12 +88,23 @@ public class AndonManageQueue extends BaseBean {
     private Integer priorityLevel;
 
     @Column(name="CALL_TIME",updatable = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "呼叫时间")
     @AnnoOutputColumn(hidden = true)
     public String callTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="呼叫时间，查询开始时间")
+    public String callTimeStart;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="呼叫时间，查询结束时间")
+    public String callTimeEnd;
+
+    @Transient
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String callTimeStr;

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java

@@ -216,4 +216,11 @@ public class AndonManageRecord extends BaseBean {
     public Integer getPriorityLevel() {
         return this.priorityLevel == null ? 0 : this.priorityLevel;
     }
+
+    public AndonManageRecord() {
+    }
+
+    public AndonManageRecord(String andonOrderNo) {
+        this.andonOrderNo = andonOrderNo;
+    }
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -170,10 +170,44 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
         getStringBuilderPack(andonManageQueue, result);
 
+        if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){
+            DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
+        }
+
+        // 根据优先级倒序，序号升序排序
+        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
+                new String[]{"priorityLevel", "seq"}, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询按灯记录信息
+     * @param andonManageRecord
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageRecord(AndonManageRecord andonManageRecord, Object[] obj){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(), "andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getEquipmentCode(), "equipmentCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(), "actionCode", result);
+        DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+
+        getStringBuilderPack(andonManageRecord, result);
+
+        // 根据优先级倒序，序号升序排序
+        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
+                new String[]{"priorityLevel", "seq"}, result);
+
         return result;
     }
 

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