diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbTranslator.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbTranslator.java index c0143cf..65312f4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbTranslator.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbTranslator.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * @Description : 接口数据转换 @@ -208,6 +209,14 @@ public class WmsSAPDbTranslator extends WmsSAPDbSyncBase { return defaultValue; } + //表达式包含 :NotTrans 或 NotTrans + boolean hasNotTrans = false; + if (defaultValue.toString().endsWith(WmsSAPDbExpression.NOT_TRANS)) { + defaultValue = defaultValue.toString().replace(":" + WmsSAPDbExpression.NOT_TRANS, ""); + defaultValue = defaultValue.toString().replace(WmsSAPDbExpression.NOT_TRANS, ""); + hasNotTrans = true; + } + Object objResult; try { @@ -221,6 +230,10 @@ public class WmsSAPDbTranslator extends WmsSAPDbSyncBase { + JSONObject.toJSONString(rowMap)); } + //添加NotTrans + if (!Objects.isNull(objResult) && hasNotTrans) { + objResult = objResult + ":" + WmsSAPDbExpression.NOT_TRANS; + } // 计算后返回 return objResult; }