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

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

@@ -115,6 +115,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("维修状态名称")
     private String repairStatusName;
 
+    @Transient
+    @ApiParam("产品二维码")
+    private String productSn;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

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

@@ -2081,10 +2081,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesProduceSn(MesProduceSn mesProduceSn, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceSn, organizeCode);
         if (!StringUtils.isEmpty(mesProduceSn.getWorkOrderNo())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkOrderNo(), "workOrderNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesProduceSn.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getPartNo(), "partNo", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean);
@@ -2093,7 +2093,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesProduceSn.getProductSn(), "productSn", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (mesProduceSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean);
@@ -2102,7 +2102,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
+            DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
         }
         if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);