Merge branch 'dev' into test

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

@@ -3568,7 +3568,8 @@ public class MesEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
 
 
         private int value;

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

@@ -131,7 +131,8 @@ public class MesPcnEnumUtil {
         PCN_LOGIN(160, "PCN_LOGIN", ""),
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
-        PCN_LOGOUT(190, "PCN_LOGOUT", "");
+        PCN_LOGOUT(190, "PCN_LOGOUT", ""),
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
 
 
         private int value;
@@ -214,6 +215,7 @@ public class MesPcnEnumUtil {
         }
 
     }
+
     /**
      * MES_TYPE_CFG 类型信息
      */
@@ -253,6 +255,7 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
     /**
      * MesProdBindRecord 是否是关键件
      */
@@ -2097,6 +2100,9 @@ public class MesPcnEnumUtil {
 
         NEVER(-1, "不过期"),
         ONE_HOUR(3600, "一小时"),
+        FIVE_MINS(300, "5分钟"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
         ONE_MIN(60, "一分钟");
 
         private int value;
@@ -2433,7 +2439,6 @@ public class MesPcnEnumUtil {
     }
 
 
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ONLINE_SEND_TYPE {
 

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
+public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
 }

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

@@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("关联单号")
     private String refOrderNo;
 
+    @Column(name="PATH_URL")
+    @ApiParam("回执单地址")
+    private String pathUrl;
+
     @Transient
     @ApiParam("打印模板列表")
     private List<WmsTmsShipModel> shipModels;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam(value ="车牌号RDD")
     private String carNo;
+
+    @ApiParam("回执单地址")
+    private String pathUrl;
 }