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

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

@@ -40,11 +40,13 @@ public class DdlPackBean {
     public DdlPackBean(){
         this.isHql = true;
         whereAppend = new StringBuilder();
+        hqlPreparedMap = new HashMap<>();
     }
 
     public DdlPackBean(boolean isHql){
         this.isHql = isHql;
         whereAppend = new StringBuilder();
+        hqlPreparedMap = new HashMap<>();
     }
 
     public boolean isHql() {

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

@@ -141,7 +141,7 @@ public class WmsEnumUtil {
     public enum MASTER_ORDER_STATUS {
         CREATE(10, "新建"),
         RECEIPT(20, "处理中"),
-        RECEIPT_FINISH(30, "已处理"),
+        RECEIPT_FINISH(30, "已完成"),
         CLOSED(40, "已关闭"),
         CANCELLED(50, "已取消");
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -54,6 +54,16 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="主对象元素名称")
     private String priElementNameRdd;
 
+    @Column(name="PRI_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="主对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long priElementPropertyId;
+
+    @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="主对象元素属性名称")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String priElementPropertyNameRdd;
+
     // 枚举:BlockFormEnumUtil.TRIGGER_EVENT
     @Column(name="PRI_ELEMENT_EVENT")
     @ApiParam(value ="主对象元素事件")
@@ -78,7 +88,16 @@ public class BfMethodDetailProperty extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long secElementId;
 
-    @Column(name="sec_element_name_rdd")
+    @Column(name="SEC_ELEMENT_NAME_RDD")
     @ApiParam(value ="关联对象元素名称")
     private String secElementNameRdd;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="关联对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long secElementPropertyId;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="关联对象元素属性名称")
+    private String secElementPropertyNameRdd;
 }

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

@@ -86,7 +86,6 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
@@ -647,7 +646,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
@@ -989,7 +987,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
@@ -1020,7 +1017,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
 
@@ -1099,11 +1095,10 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
         StringBuffer result = new StringBuffer();
-
         //单号
         HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
-        //行号
+        //物料
-        HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result);
+        HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsQCTrans, result);