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

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java

@@ -90,7 +90,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
 
     @Override
     public Integer getIsMemory(String organizeCode, String userName) {
-        Object object = redisMesPcn.getObject(new StringJoiner(MesPcnExtConstWords.COLON).add(organizeCode).add(this.getClass().getSimpleName()).add(userName).toString());
+        Object object = redisMesPcn.getObject(getKey(organizeCode, userName));
         if (Objects.isNull(object)) {
             return CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
         } else {
@@ -159,7 +159,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                 updateMesPackage(mesPackage, mesPackageDetail.getModifyUser(), 1d, false);
             }
             //缓存是否记忆开关
-            saveRedis(new StringJoiner(MesPcnExtConstWords.COLON).add(mesPackageDetail.getOrganizeCode()).add(this.getClass().getSimpleName()).add(mesPackageDetail.getModifyUser()).toString(),mesPackageDetail.getIsMemory());
+            saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory());
             mesPackage.setMesPackageDetail(saveMesPackageDetail);
             return mesPackage;
         }
@@ -538,4 +538,8 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
         }
     }
 
+    private String getKey(String organizeCode, String userName) {
+        return new StringJoiner(MesPcnExtConstWords.COLON).add(organizeCode).add(MesPcnExtConstWords.USER_INFO_CONTEXT).add(userName).add(MesPcnExtConstWords.BOXING_ERROR_PROOFING).add(MesPcnExtConstWords.IS_MEMORY).toString();
+    }
+
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -504,6 +504,12 @@ public class MesPcnExtConstWords {
     public static final String REPEAT_ASSEMBLY_SN_CONTEXT = "REPEAT_ASSEMBLY_SN_CONTEXT";
     // 设备计数上下文
     public static final String SHORT_COUNTER_CONTEXT = "SHORT_COUNTER_CONTEXT";
+    // 用户缓存
+    public static final String USER_INFO_CONTEXT = "USER_INFO_CONTEXT";
+    // 装箱防错
+    public static final String BOXING_ERROR_PROOFING = "BOXING_ERROR_PROOFING";
+    // 是否记忆
+    public static final String IS_MEMORY = "IS_MEMORY";
 
     // 上下文: 展示组件数据
     public static final String MODULE_CONTENT_CONTEXT = "MODULE_CONTENT_CONTEXT";