1.料架入库或者出库的时候,特殊条码处理

2.资源翻译上传的时候,设置成已经修改

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -1118,6 +1118,14 @@ public class BaseDeviceHandler implements IDeviceHandler {
         }
         }
     }
     }
 
 
+    protected String replaceSpecial(String code){
+        code = code.replace("[RS]","$");
+        code = code.replace("[GS]","$");
+        code = code.replace("[EOT]","$");
+        return code;
+    }
+
+
     @Override
     @Override
     public DeviceType getDeviceType() {
     public DeviceType getDeviceType() {
         return DeviceType.DEFAULT;
         return DeviceType.DEFAULT;

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLLShelfHandler.java

@@ -104,6 +104,8 @@ public class NLLShelfHandler extends BaseDeviceHandler {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
         }
 
 
+        code = replaceSpecial(code);
+
         Barcode barcode = codeResolve.resolveOneValideBarcode(code);
         Barcode barcode = codeResolve.resolveOneValideBarcode(code);
         if (barcode == null) {
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.noValidCode", "条码无效");
             throw new ValidateException("smfcore.error.barcode.noValidCode", "条码无效");
@@ -185,6 +187,10 @@ public class NLLShelfHandler extends BaseDeviceHandler {
         String posName = paramMap.get("posName");
         String posName = paramMap.get("posName");
         String code = paramMap.get("code");
         String code = paramMap.get("code");
 
 
+        if (StringUtils.isNotEmpty(code)){
+            code = replaceSpecial(code);
+        }
+
         Barcode barcode = codeResolve.resolveOneValideBarcode(code);
         Barcode barcode = codeResolve.resolveOneValideBarcode(code);
         if (barcode == null) {
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.noValidCode", "条码无效");
             throw new ValidateException("smfcore.error.barcode.noValidCode", "条码无效");

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLMShelfHandler.java

@@ -222,6 +222,9 @@ public class NLMShelfHandler extends BaseDeviceHandler  {
         if (ObjectUtils.isEmpty(code)) {
         if (ObjectUtils.isEmpty(code)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
         }
+
+        code = replaceSpecial(code);
+
         if (groupId == null && storageId == null) {
         if (groupId == null && storageId == null) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
         }
         }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -64,6 +64,9 @@ public class NLPShelfHandler extends BaseDeviceHandler {
         if (ObjectUtils.isEmpty(code)) {
         if (ObjectUtils.isEmpty(code)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
         }
+
+        code = replaceSpecial(code);
+
         if (groupId == null && storageId == null) {
         if (groupId == null && storageId == null) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
         }
         }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -270,6 +270,9 @@ public class NLShelfHandler extends BaseDeviceHandler {
         if (ObjectUtils.isEmpty(code)) {
         if (ObjectUtils.isEmpty(code)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
         }
+
+        code = replaceSpecial(code);
+
         if (groupId == null && storageId == null) {
         if (groupId == null && storageId == null) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"group"});
         }
         }

src/main/java/com/neotel/smfcore/core/language/util/LanguageMsgService.java

@@ -360,6 +360,9 @@ public class LanguageMsgService {
 
 
                 }
                 }
                 if (isUpdate) {
                 if (isUpdate) {
+                    if (isNeedUpdate) {
+                        oldMsg.setEdited(true);
+                    }
                     updateLanguageList.add(oldMsg);
                     updateLanguageList.add(oldMsg);
                     languageMsgManager.save(oldMsg);
                     languageMsgManager.save(oldMsg);
                     MessageUtils.updateMsg(oldMsg);
                     MessageUtils.updateMsg(oldMsg);