diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/MesSpotCheckOrderToSap.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/MesSpotCheckOrderToSap.groovy index 3273231..23dc456 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/MesSpotCheckOrderToSap.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/MesSpotCheckOrderToSap.groovy @@ -6,6 +6,7 @@ import lombok.Setter import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate +import org.springframework.util.StringUtils import javax.annotation.Resource import java.sql.Connection @@ -54,10 +55,10 @@ class MesSpotCheckOrderToSap { checkMap.put("task_item_name",objectMap.get("task_item_name")); checkMap.put("max_value",objectMap.get("max_value")); checkMap.put("min_value",objectMap.get("min_value")); - checkMap.put("task_item_type",objectMap.get("data_type")); - checkMap.put("item_task_result",objectMap.get("spot_check_result")); + checkMap.put("task_item_type",StringUtils.isEmpty(objectMap.get("data_type"))?"":"10".equals(objectMap.get("data_type"))?"1":"2"); + checkMap.put("item_task_result",StringUtils.isEmpty(objectMap.get("spot_check_result"))?"":"OK".equals(objectMap.get("spot_check_result"))?"True":"False"); checkMap.put("task_value",objectMap.get("spot_check_real_value")); - checkMap.put("IsAuto",objectMap.get("spot_check_item_type")); + checkMap.put("IsAuto",StringUtils.isEmpty(objectMap.get("spot_check_item_type"))?"":"10".equals(objectMap.get("spot_check_item_type"))?"1":"2"); checkMap.put("ConfigValue",objectMap.get("spot_check_set_value")); checkMap.put("Remark",objectMap.get("remark"));