Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -161,4 +161,112 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * MesPlanOrder实体对应的planType值  计划类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PALN_ORDER_TYPE{
+
+        ATTEMPT_ORDER(10,"标准");
+
+        private int value;
+        private String description;
+
+        PALN_ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PALN_ORDER_SOURCE{
+
+        MES("MES","来源于MES"),
+        SAP("SAP","来源于SAP");
+
+        private String value;
+        private String description;
+
+        PALN_ORDER_SOURCE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_SOURCE{
+
+        MES("MES","来源于MES"),
+        AMES("AMES","来源于AMES"),
+        SAP("SAP","来源于SAP");
+
+        private String value;
+        private String description;
+
+        WORK_ORDER_SOURCE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -246,7 +246,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             }
             //查询条件
             for (String key : packBean.getHqlPreparedMap().keySet()) {
-                query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+                query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
             }
 
             return query.executeUpdate();
@@ -328,7 +328,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         for (String key : packBean.getHqlPreparedMap().keySet()) {
-            query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
         }
 
         return query.setFirstResult(offset)

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -101,4 +102,8 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @Column(name = "PACKAGE_NO")
     @ApiParam(value = "包装编号")
     public String packageNo;
+
+    @Transient
+    @ApiParam(value = "是否可编辑（前端使用）")
+    public boolean isSet = false;
 }

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

@@ -50,6 +50,7 @@ public class SwebHqlPack {
         DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(),
                 purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false);
         DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(purchaseOrder, result);
     }
 
@@ -58,6 +59,7 @@ public class SwebHqlPack {
         DdlPreparedPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
         DdlPreparedPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
         DdlPreparedPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(swebPackage, result);
     }
 
@@ -71,6 +73,7 @@ public class SwebHqlPack {
         // 封装有效状态和删除状态
         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);
     }
 
@@ -78,12 +81,14 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(swebProcurementPlanOrder, result);
     }
 
     public static DdlPackBean getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(swebProcurementPlanOrderDetails, result);
     }
 
@@ -91,6 +96,7 @@ public class SwebHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(vendorRel, result);
     }
 

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

@@ -81,4 +81,8 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件")
     private Integer isPart;
+
+    public Integer getIsInventoryVal() {
+        return this.isInventory == null ? 0 :this.isInventory.intValue();
+    }
 }