Merge branch 'dev' into test

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

@@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean {
     private List<Object> statusList;
 
     @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> typeList;
+
+    @Transient
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 

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

@@ -271,11 +271,13 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
         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.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
         if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
@@ -285,6 +287,7 @@ public class AndonHqlPack {
         // 根据优先级倒序，序号升序排序
 //        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
 //                new String[]{"priorityLevel", "seq"}, result);
+
          result.setOrderByStr(andonManageQueue.orderBy());
 
         return result;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
@@ -21,7 +22,7 @@ import java.util.List;
  **/
 @Data
 @Api("订单基类")
-public class BaseOrder extends BaseAPS {
+public class BaseOrder extends BaseCode {
     @Column(name="COUNT")
     @ApiParam(value ="数量")
     private Double count;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.lang.reflect.Method;
+import java.sql.JDBCType;
 
 /**
  * @Description :字段信息
@@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode {
     @ApiParam(value ="主键标识")
     private Boolean mainKey;
 
+    @Column(name="JDBC_TYPE")
+    @ApiParam(value ="数据库类型")
+    private JDBCType jdbcType;
+
     @JsonIgnore
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,4 +38,7 @@ public class Inventory extends BaseOrder {
     @ApiParam(value ="多余量")
     private Double excessCount;
 
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder {
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
     private Double excessCount;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder {
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
     private String calcLeadTime;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java

@@ -243,7 +243,7 @@ public class BeanRelationUtil {
      * 将指定包下的类加载到内存中
      * @param packName
      */
-    private static List<Class<?>> loadClass(String packName) {
+    public static List<Class<?>> loadClass(String packName) {
         List<Class<?>> clses = new ArrayList<>();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         String strFile = packName.replaceAll("\\.", "/");

modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml

@@ -2,6 +2,6 @@
 <Class name="ImportProject">
     <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
     </Relation>
-    <Relation field="Details" name="ImportDetail" reverset="Project" type="ONE_TO_MULTI" owner="true">
+    <Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
     </Relation>
 </Class>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
         String result = "";
         if (orderByParam!=null&&orderByParam.trim().length()>0) {
             result = " order by " + orderByParam;
-            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+            if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
                 result += " asc";
             }else{
                 result += " desc";

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

@@ -598,7 +598,9 @@ public class WmsEnumUtil {
         ASN(200, "ASN", "ASN"),
         PO(210, "PO", "PO"),
         QC(220, "QC", "QC"),
-        AMPR(230, "AMPR", "AMPR");
+        AMPR(230, "AMPR", "AMPR"),
+        FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
 
 
         private int value;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -530,6 +530,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in List查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.size() > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -572,9 +585,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "" + dataArray[i] + "";
+                    data += "'" + dataArray[i] + "'";
                 } else {
-                    data += "" + dataArray[i] + ",";
+                    data += "'" + dataArray[i] + "',";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);