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

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

@@ -22,14 +22,13 @@ import java.io.Serializable;
  * @Modify:
  **/
 @Data
-@Entity
+@MappedSuperclass
+//@Entity
 //以子类table为准
-@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
+//@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失
@@ -130,7 +129,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
-    public Integer ascOrDesc = 1;
+    public transient Integer ascOrDesc = 1;
 
     //排序方式
     public String orderBy(){

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

@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-23 15:53
+ * @Modify:
+ **/
+public class MesPcnEnumUtil {
+    /**
+     * PCN同步MES主数据同步方式枚举
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_PATTERN{
+
+        UPDATE(1,"修改或新增"),
+        INSERT(2,"新增");
+
+        private int value;
+        private String description;
+
+        SYNC_PATTERN(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;
+        }
+    }
+
+    /**
+     * PCN同步MES主数据同步类型枚举
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SYNC_TYPE{
+
+        GET_MES_DATA(1,"pcn获取mes数据"),
+        DATA_TO_MES(2,"pcn推送数据至mes");
+
+        private int value;
+        private String description;
+
+        SYNC_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;
+        }
+    }
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.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 :物料信息
@@ -71,4 +72,8 @@ public class MesPart extends BaseBean {
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")
     private String  produceCategory;
+
+    @Transient
+    @ApiParam("分类名称")
+    private String categoryName;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN")
+@Api("PCN节点")
+public class MesPcn extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域")
+    private String areaCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCentreCode;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java

@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_CFG")
+@Api("MES_PCN_同步配置")
+public class MesPcnSyncCfg extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="OBJECT_KEY")
+    @ApiParam("对象主键")
+    private String objectKey;
+
+    @Column(name="SYNC_FREQUENCY")
+    @ApiParam("同步频率")
+    private Integer syncFrequency;
+
+    @Column(name="SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="同步时间")
+    private String syncTime;
+
+    @Column(name="SYNC_PATTERN")//2、新增  1、修改
+    @ApiParam("同步方式")
+    private Integer syncPattern;
+
+    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @ApiParam("同步类型")
+    private Integer syncType;
+
+    @Column(name="LAST_SYNC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value ="上一同步时间")
+    private String lastSyncTime;
+
+    public int getSyncFrequencyVal() {
+        return this.syncFrequency == null ? 0 : this.syncFrequency;
+    }
+
+    public int getSyncTypeVal() {
+        return this.syncType == null ? 0 : this.syncType;
+    }
+
+    public int getSyncPatternVal() {
+        return this.syncPattern == null ? 0 : this.syncPattern;
+    }
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_ERRORLOG")
+@Api("MES_PCN同步异常日志")
+public class MesPcnSyncErrorLog extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="ERROR_SPOT")
+    @ApiParam("异常位置")
+    private String errorSpot;
+
+    @Column(name="ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private String errorContent;
+
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncCfgRepository extends BaseRepository<MesPcnSyncCfg, Long> {
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSyncErrorLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSyncErrorLogRepository extends BaseRepository<MesPcnSyncErrorLog, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :MES_对象与dao对应关系
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-04-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_OBJECT_DAO")
+@Api("MES_对象与dao对应关系")
+public class MesObjectDao extends BaseBean {
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="DAO_CLASS")
+    @ApiParam("dao层类名")
+    private String daoClass;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesObjectDaoRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesObjectDao;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-23
+ * @Modify:
+ **/
+@Repository
+public interface MesObjectDaoRepository extends BaseRepository<MesObjectDao, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -145,14 +145,14 @@ public class MesHqlPack {
         }
 
         // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getStartTimeStart(),
-                mesWorkOrder.getStartTimeEnd(),
-                "startTime", packBean, true);
-        DdlPreparedPack.timeBuilder(
-                mesWorkOrder.getEndTimeStart(),
-                mesWorkOrder.getEndTimeEnd(),
-                "endTime", packBean, true);
+//        DdlPreparedPack.timeBuilder(
+//                mesWorkOrder.getStartTimeStart(),
+//                mesWorkOrder.getStartTimeEnd(),
+//                "startTime", packBean, true);
+//        DdlPreparedPack.timeBuilder(
+//                mesWorkOrder.getEndTimeStart(),
+//                mesWorkOrder.getEndTimeEnd(),
+//                "endTime", packBean, true);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
         return packBean;

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

@@ -174,13 +174,13 @@ public class WmsDocMovementDetails extends BaseBean {
         return recommondLot == null ? "无" : this.recommondLot;
     }
 
-    public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+    public Double getQty() {return qty == null ? 0D : this.qty.doubleValue(); }
 
-    public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
+    public Double getOutQty() {return outQty == null ? 0D : this.outQty.doubleValue(); }
 
-    public Double getPickQty() {return pickQty == null ? 0L : this.pickQty.doubleValue(); }
+    public Double getPickQty() {return pickQty == null ? 0D : this.pickQty.doubleValue(); }
 
-    public Double getActualQty() {return actualQty == null ? 0L : this.actualQty.doubleValue(); }
+    public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
 
 }

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

@@ -101,15 +101,15 @@ public class WmsHqlPack {
      * @param wmsDocMovementDetails
      * @return
      */
-    public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -474,7 +474,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result);
         DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
@@ -578,7 +578,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
@@ -627,7 +627,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         //采购单号
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result);
@@ -646,7 +646,7 @@ public class WmsHqlPack {
     }
 
     public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
@@ -828,6 +828,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询单据锁定封装类
+     *
      * @return 单据锁定信息
      */
     public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
@@ -951,10 +952,10 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
 
@@ -1032,6 +1033,7 @@ public class WmsHqlPack {
 
     /**
      * 针对质检查询库存移动条码条件封装(特殊处理)
+     *
      * @param sn
      * @return
      */
@@ -1102,7 +1104,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) {
-        DdlPackBean  result = new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
         DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
@@ -1520,7 +1522,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List<String> orderList) {
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
@@ -1572,12 +1574,12 @@ public class WmsHqlPack {
      * @param wmsTaskCreateLog
      * @return
      */
-    public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
-        HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
+    public static DdlPackBean packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
         getStringBuilderPack(wmsTaskCreateLog, result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1625,14 +1627,14 @@ public class WmsHqlPack {
      * @param wmsDocMovementSn
      * @return
      */
-    public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
+    public static DdlPackBean packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1641,14 +1643,14 @@ public class WmsHqlPack {
      * @param details
      * @return
      */
-    public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
+    public static DdlPackBean packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
 
         getStringBuilderPack(details, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1697,8 +1699,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "",
-                WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result);
+        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() ,
+                WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);