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

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

@@ -1913,6 +1913,35 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        PO_SN("PO_SN", "PO条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 可选项类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2191,4 +2220,37 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10 , "BOX", "BOX（盒）"),
+        CARTON(20 , "CARTON", "CARTON（箱）"),
+        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value , String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -75,6 +75,12 @@ public class WmsActionResponseBean<Obj> {
     public Boolean isDetailsBtnDisabled = true;
 
     /**
+     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     */
+    @ApiParam(value = "输入框是否禁用")
+    public Boolean isInputBtnDisabled = false;
+
+    /**
      * 与 toSelected 属性配合使用，
      * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
      */

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

@@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")

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

@@ -24,9 +24,9 @@ import java.util.stream.Collectors;
  **/
 public class WmsHqlPack {
 
-    public static String packInParams(String colnumName,String[] params){
+    public static String packInParams(String colnumName, String[] params) {
         StringBuffer sb = new StringBuffer();
-        HqlPack.getInPackString(String.join(",", params),colnumName,sb);
+        HqlPack.getInPackString(String.join(",", params), colnumName, sb);
         return sb.toString();
     }
 
@@ -88,27 +88,27 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询任务合并的移库单明细 查询条件封装
      *
+     * @param colName
      * @param orderNos
      * @return
      */
-    public static String packWmsOrderDetailsByOrderNos(List<String> orderNos) {
+    public static String packWmsOrderDetailsByOrderNos(String colName, List<String> orderNos) {
         StringBuffer result = new StringBuffer();
         StringBuffer orderNoStr = new StringBuffer();
         for (int i = 0; i < orderNos.size(); i++) {
-            if (i == orderNos.size()) {
-                orderNoStr.append("'" + orderNos.get(i) + "'");
-            } else {
             orderNoStr.append("'" + orderNos.get(i) + "',");
         }
-        }
+        orderNoStr.deleteCharAt(orderNoStr.length() - 1);
         result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
-                "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
+                " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
-                "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo");
+                " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo");
         return result.toString();
     }
+
     /**
      * 库存移动单查询封装
      *
@@ -217,10 +217,10 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
         getStringBuilderPack(wmsIbCheckPlan, result);
 
-        if(wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) {
+        if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
         }
-        if(wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) {
+        if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
         }
 
@@ -411,6 +411,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 查询满足处理周期的作业类型 查询条件封装
      *
@@ -441,6 +442,7 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
      * 存储区信息 查询条件封装
      *
@@ -457,7 +459,7 @@ public class WmsHqlPack {
         //存储区代码
         HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result);
         //存储区名称
-        HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result);
+        HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result);
 
         getStringBuilderPack(wmsZones, result);
 
@@ -523,7 +525,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
 
-        getStringBuilderPack(wmsASNMaster,result);
+        getStringBuilderPack(wmsASNMaster, result);
 
         return result.toString();
     }
@@ -602,7 +604,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
 
-        getStringBuilderPack(wmsASNMasterDetails,result);
+        getStringBuilderPack(wmsASNMasterDetails, result);
 
         return result.toString();
     }
@@ -686,7 +688,7 @@ public class WmsHqlPack {
      * @param wmsCSLocate
      * @return
      */
-    public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){
+    public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result);
@@ -702,12 +704,12 @@ public class WmsHqlPack {
      * @param wmsCSPart
      * @return
      */
-    public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){
+    public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result);
+        HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result);
 
         getStringBuilderPack(wmsCSPart, result);
 
@@ -719,7 +721,7 @@ public class WmsHqlPack {
      * @param wmsCSZone
      * @return
      */
-    public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){
+    public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result);
@@ -873,17 +875,18 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
     /**
-     *内部单据：库存移动单主表唯一性查询
+     * 内部单据：库存移动单主表唯一性查询
      * @param wmsMoveMaster
      * @return
      */
-    public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster){
+    public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(),"id",result);
+        HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result);
-        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
+        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
 
         getStringBuilderPack(wmsMoveMaster, result);
 
@@ -895,11 +898,11 @@ public class WmsHqlPack {
      * @param wmsMoveMaster
      * @return
      */
-    public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster){
+    public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
+        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         getStringBuilderPack(wmsMoveMaster, result);
 
@@ -911,7 +914,7 @@ public class WmsHqlPack {
      * @param wmsMoveDetails
      * @return
      */
-    public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails){
+    public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
@@ -921,15 +924,15 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result);
+        HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result);
+        HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result);
+        HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result);
 
         getStringBuilderPack(wmsMoveDetails, result);
 
@@ -941,7 +944,7 @@ public class WmsHqlPack {
      * @param wmsMoveSn
      * @return
      */
-    public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn){
+    public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
@@ -1163,7 +1166,7 @@ public class WmsHqlPack {
      * 作业流程分页查询
      * @return
      */
-    public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){
+    public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装 agDescC;agNameC
@@ -1178,7 +1181,7 @@ public class WmsHqlPack {
      * 作业流程明细分页查询
      * @return
      */
-    public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails){
+    public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
@@ -1232,19 +1235,19 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) {
-            HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
+            HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(),
                     "startTime", result, true);
         } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) {
-            HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
+            HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(),
                     "endTime", result, true);
         }
 
         // 作业流程编号
-        HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result);
+        HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result);
         // 作业流程名称
-        HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result);
+        HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result);
         // 单据编号
-        HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result);
+        HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsActionLog, result);
 
@@ -1256,12 +1259,12 @@ public class WmsHqlPack {
      * @param wmsActionLogDetails
      * @return
      */
-    public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){
+    public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) {
         StringBuffer result = new StringBuffer();
 
         //作业流程id（对应作业记录明细里自增的id）
-        HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result);
-        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result);
         HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result);
         HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result);
         HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result);
@@ -1294,13 +1297,14 @@ public class WmsHqlPack {
 
     /**
      * 按moveNo 取最后一笔插入的数据
+     *
      * @param wmsMoveSn
      * @return
      */
     public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsMoveSn, result);
         HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
 
@@ -1309,27 +1313,29 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
     public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
-        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
-        HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
-        HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
         getStringBuilderPack(wmsStockSn, result);
         return result.toString();
     }
 
     /**
      * 根据条件模糊查询库存条码信息
+     *
      * @param wmsStockSn
      * @return
      */
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result);
+        HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         getStringBuilderPack(wmsStockSn, result);
         HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
@@ -1337,24 +1343,26 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询库存信息
+     *
      * @param wmsStockQuan
      * @return
      */
     public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         getStringBuilderPack(wmsStockQuan, result);
         return result.toString();
     }
 
     /**
      * 根据用户角色id列表查询数据权限信息
+     *
      * @return
      */
     public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result);
+        HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
         String data = String.join(",", roleIds);
         HqlPack.getInPackString(data, "roleCode", result);
         getStringBuilderPack(new WmsDataAuth(), result);
@@ -1366,11 +1374,11 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static String packHqlWmsTaskDetail(Map<String ,List<WmsDataAuth>> groupDataAuth) {
+    public static String packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
         StringBuffer result = new StringBuffer();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
-        entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{
+        entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> {
             List<WmsDataAuth> value = o.getValue();
             List<String> vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
             String data = String.join(",", vList);
@@ -1405,10 +1413,10 @@ public class WmsHqlPack {
      * @param vals
      * @return
      */
-    public static String packHqlAndIn(BaseBean bean,String columnName,List<String> vals) {
+    public static String packHqlAndIn(BaseBean bean, String columnName, List<String> vals) {
         StringBuffer result = new StringBuffer();
         String data = String.join(",", vals);
-        HqlPack.getInPackString(data,columnName,result);
+        HqlPack.getInPackString(data, columnName, result);
         getStringBuilderPack(bean, result);
         return result.toString();
     }
@@ -1420,14 +1428,14 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
         StringBuffer result = new StringBuffer();
-        if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) {
-            HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result);
+            HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
         }
-        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) {
-            HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result);
+            HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
         }
-        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
-            HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result);
+            HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
         }
         getStringBuilderPack(wmsDataAuth, result);
         return result.toString();
@@ -1447,6 +1455,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询任务生成日志
+     *
      * @param wmsTaskCreateLog
      * @return
      */
@@ -1460,23 +1469,25 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询作业处理组件
+     *
      * @param wmsTransModule
      * @return
      */
     public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) {
         StringBuffer result = new StringBuffer();
-        if(!Strings.isNullOrEmpty(wmsTransModule.getTmName())){
+        if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) {
             HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result);
         }
-        if(!Strings.isNullOrEmpty(wmsTransModule.getCallClass())){
+        if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) {
             HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result);
         }
-        if(!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())){
+        if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) {
             HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result);
         }
         getStringBuilderPack(wmsTransModule, result);
         return result.toString();
     }
+
     /**
      * 根据条件查询系统配置信息
      * @param wmsConfig