Merge branch 'dev' into test

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

@@ -120,7 +120,7 @@ public class AndonHqlPack {
     }
 
     /**
-     * 按条件查询ANDON呼叫原因
+     * 按条件查询ANDON呼叫原因,==
      * @param andonAlarmCause
      * @return
      */
@@ -134,6 +134,22 @@ public class AndonHqlPack {
 
         return result;
     }
+    /**
+     * 按条件模糊查询ANDON呼叫原因,
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
+
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
 
     /**
      * 按条件查询ANDON事件处理方法
@@ -439,6 +455,11 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
         DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
+
         getStringBuilderPack(andonEventCause, result);
 
         return result;
@@ -487,8 +508,29 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonPLC(AndonPLC plc) {
         DdlPackBean result = new DdlPackBean();
-        getStringBuilderPack(plc, result);
 
+        DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
+
+        getStringBuilderPack(plc, result);
         return result;
     }
+
+    /**
+     * 检查安灯记录是否以存在
+     * @param andonManageRecord
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result);
+
+        getStringBuilderPack(andonManageRecord, result);
+        return  result;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -242,25 +242,31 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM","物料"),
+        PART("PART_ALARM", 111020005, "物料"),
-        QUALITY("QUALITY_ALARM","质量"),
+        QUALITY("QUALITY_ALARM", 111020006, "质量"),
-        EQUIP("EQUMENT_ALARM","设备"),
+        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
-        PROCESS("ROUTING_ALARM","工艺"),
+        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
-        CHECK("OTHER_ALARM","其他"),
+        CHECK("OTHER_ALARM", 111020009, "其他"),
-        FIX_ERROR("FIX_ERROR", "自动报警");
+        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
 
         private String value;
+        private Integer code;
         private String description;
 
-        ALARM_TYPE(String value, String description) {
+        ALARM_TYPE(String value, Integer code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
-        public String getValue() {
+         public String getValue() {
             return value;
         }
 
+        public Integer getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1082,7 +1082,8 @@ public class WmsEnumUtil {
         CREATE(10, "创建"),
         BE_HANDLE(20, "待处理"),
         FINISH(30, "已处理"),
-        HANDLE_ERROR(40, "处理出错");
+        HANDLE_ERROR(40, "处理出错"),
+        TEST(50, "调试");
 
         private int value;
         private String description;
@@ -2693,7 +2694,7 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
-        AMP("AMP","AMP系统");
+        AMP("AMP", "AMP系统");
 
         private String value;
         private String description;

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

@@ -59,6 +59,10 @@ public class SysOrganize extends BaseBean {
     @ApiParam(value ="组织描述")
     private String organizeDescription;
 
+    @Column(name="ORGANIZE_ADDRESS")
+    @ApiParam(value ="组织地址")
+    private String organizeAddress;
+
     @Column(name="ORGANIZE_SORT")
     @ApiParam(value ="排序" , example ="1")
     private Integer organizeSort;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -381,6 +381,7 @@ public class CoreHqlPack {
 
         // And X = X
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
         HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
@@ -491,6 +492,7 @@ public class CoreHqlPack {
 
         // And
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 //        HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
 //        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java

@@ -122,42 +122,50 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
 
-    public Double getQty() {
+    @Transient
+    @ApiParam(value = "总数量")
+    private Double totalQty;
+
+    public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }
 
-    public Double getFailQty() {
+    public Double getFailQtyVal() {
         return this.failQty == null ? 0 : this.failQty;
     }
 
-    public Double getHoldQty() {
+    public Double getHoldQtyVal() {
         return this.holdQty == null ? 0 : this.holdQty;
     }
 
-    public Double getQcQty() {
+    public Double getQcQtyVal() {
         return this.qcQty == null ? 0 : this.qcQty;
     }
 
-    public Double getRinQty() {
+    public Double getRinQtyVal() {
         return this.rinQty == null ? 0 : this.rinQty;
     }
 
-    public Double getFreezeQty() {
+    public Double getFreezeQtyVal() {
         return this.freezeQty == null ? 0 : this.freezeQty;
     }
 
-    public Double getConsignQty() {
+    public Double getConsignQtyVal() {
         return this.consignQty == null ? 0 : this.consignQty;
     }
 
-    public Double getLockQty() {
+    public Double getLockQtyVal() {
         return this.lockQty == null ? 0 : this.lockQty;
     }
 
-    public Double getScrapQty() {
+    public Double getScrapQtyVal() {
         return this.scrapQty == null ? 0 : this.scrapQty;
     }
 
+    public Double getTotalVal() {
+        return this.totalQty == null ? 0 : this.totalQty;
+    }
+
     public WmsStockQuan() {
     }
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -412,7 +412,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        if(wmsLocate.getZoneNo() != null){
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result);
+        }
+
+       // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
 
         getStringBuilderPack(wmsLocate, result);